From 5310be8838f8db748a698bd3a98f8d00a4114e65 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Tue, 18 Oct 2016 15:16:17 +0530 Subject: events: Add FMT_WARN for gf_event Raghavendra G found that posix is trying to print %s but passing an int when HEALTH_CHECK fails in posix. These are the kind of bugs that should be caught at compilation itself. Also fixed the problematic gf_event() callers. BUG: 1386097 Change-Id: Id7bd6d9a9690237cec3ca1aefa2aac085e8a1270 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/15671 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Atin Mukherjee CentOS-regression: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-utils.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index d916444a9b2..504ffdbe04c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4383,10 +4383,7 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, ret = glusterd_import_friend_volumes (peer_data); if (ret) goto out; - - if (glusterd_svcs_manager (NULL)) { - gf_event (EVENT_SVC_MANAGER_FAILED, ""); - } + glusterd_svcs_manager (NULL); } out: @@ -4915,9 +4912,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf) continue; if (start_svcs == _gf_false) { start_svcs = _gf_true; - if (glusterd_svcs_manager (NULL)) { - gf_event (EVENT_SVC_MANAGER_FAILED, ""); - } + glusterd_svcs_manager (NULL); } gf_msg_debug (this->name, 0, "starting the volume %s", volinfo->volname); @@ -4967,9 +4962,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf) } if (start_svcs == _gf_false) { start_svcs = _gf_true; - if (glusterd_svcs_manager (volinfo)) { - gf_event (EVENT_SVC_MANAGER_FAILED, ""); - } + glusterd_svcs_manager (volinfo); } start_svcs = _gf_true; gf_msg_debug (this->name, 0, "starting the snap " -- cgit