|
 |
3604df |
From 1755a9d3da61860aa8bbe0137d572a51981e1d68 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
Date: Mon, 1 Aug 2016 11:56:27 +0530
|
|
|
3604df |
Subject: [PATCH 35/86] events: move conditional macro check USE_EVENTS inside gf_events
|
|
|
3604df |
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15054
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Kotresh HR <khiremat@redhat.com>
|
|
|
3604df |
> Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I88279b11b648e676a4544bbb55c7466fbc55ffa7
|
|
|
3604df |
BUG: 1351589
|
|
|
3604df |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/84741
|
|
|
3604df |
Tested-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
|
|
|
3604df |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-peer.c | 4 ----
|
|
|
3604df |
cli/src/cli-cmd-volume.c | 8 --------
|
|
|
3604df |
libglusterfs/src/events.c | 4 +++-
|
|
|
3604df |
3 files changed, 3 insertions(+), 13 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c
|
|
|
3604df |
index 36c328a..fc72075 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-peer.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-peer.c
|
|
|
3604df |
@@ -90,11 +90,9 @@ out:
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_PEER_ATTACH, "host=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
@@ -166,11 +164,9 @@ out:
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_PEER_DETACH, "host=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
index 7e53514..740a867 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-volume.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
@@ -243,11 +243,9 @@ out:
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_VOLUME_CREATE, "name=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
@@ -322,11 +320,9 @@ out:
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_VOLUME_DELETE, "name=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
@@ -402,11 +398,9 @@ out:
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_VOLUME_START, "name=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
@@ -540,11 +534,9 @@ out:
|
|
|
3604df |
|
|
|
3604df |
CLI_STACK_DESTROY (frame);
|
|
|
3604df |
|
|
|
3604df |
-#if (USE_EVENTS)
|
|
|
3604df |
if (ret == 0) {
|
|
|
3604df |
gf_event (EVENT_VOLUME_STOP, "name=%s", (char *)words[2]);
|
|
|
3604df |
}
|
|
|
3604df |
-#endif
|
|
|
3604df |
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c
|
|
|
3604df |
index 9d78187..2df8c29 100644
|
|
|
3604df |
--- a/libglusterfs/src/events.c
|
|
|
3604df |
+++ b/libglusterfs/src/events.c
|
|
|
3604df |
@@ -23,12 +23,13 @@
|
|
|
3604df |
int
|
|
|
3604df |
gf_event (int event, char *fmt, ...)
|
|
|
3604df |
{
|
|
|
3604df |
+ int ret = 0;
|
|
|
3604df |
+#if (USE_EVENTS)
|
|
|
3604df |
int sock = -1;
|
|
|
3604df |
char eventstr[EVENTS_MSG_MAX] = "";
|
|
|
3604df |
struct sockaddr_un server;
|
|
|
3604df |
va_list arguments;
|
|
|
3604df |
char *msg = NULL;
|
|
|
3604df |
- int ret = 0;
|
|
|
3604df |
size_t eventstr_size = 0;
|
|
|
3604df |
|
|
|
3604df |
if (event < 0 || event >= EVENT_LAST) {
|
|
|
3604df |
@@ -79,5 +80,6 @@ gf_event (int event, char *fmt, ...)
|
|
|
3604df |
out:
|
|
|
3604df |
sys_close(sock);
|
|
|
3604df |
GF_FREE(msg);
|
|
|
3604df |
+#endif
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|