|
 |
3604df |
From d444871bc9b1a278c64676eed7015c4acadf1e07 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
Date: Thu, 20 Oct 2016 16:26:27 +0530
|
|
|
3604df |
Subject: [PATCH 155/157] eventsapi: Fix sending event during volume set help
|
|
|
3604df |
|
|
|
3604df |
Event sent when `gluster volume set help` command is run
|
|
|
3604df |
with Volume name as "help" and empty options list
|
|
|
3604df |
|
|
|
3604df |
With this patch, event sent only when volume set on a real volume
|
|
|
3604df |
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15685
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1387152
|
|
|
3604df |
Change-Id: Ia8785d6108cb86f7d89ecf9ea552df0334b41398
|
|
|
3604df |
Signed-off-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/89418
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-volume.c | 2 +-
|
|
|
3604df |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
index 67da5a6..998bf46 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-volume.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
@@ -828,7 +828,7 @@ out:
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
#if (USE_EVENTS)
|
|
|
3604df |
- if (ret == 0) {
|
|
|
3604df |
+ if (ret == 0 && strcmp(words[2], "help") != 0) {
|
|
|
3604df |
ret1 = dict_get_int32 (options, "count", &num_options);
|
|
|
3604df |
if (ret1)
|
|
|
3604df |
num_options = 0;
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|