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-svc-helper.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-svc-helper.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c index 72f00922667..70a12dff499 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c @@ -28,16 +28,19 @@ glusterd_svcs_reconfigure () int ret = 0; xlator_t *this = THIS; glusterd_conf_t *conf = NULL; + char *svc_name = NULL; GF_ASSERT (this); conf = this->private; GF_ASSERT (conf); + svc_name = "nfs"; ret = glusterd_nfssvc_reconfigure (); if (ret) goto out; + svc_name = "self-heald"; ret = glusterd_shdsvc_reconfigure (); if (ret) goto out; @@ -45,20 +48,24 @@ glusterd_svcs_reconfigure () if (conf->op_version == GD_OP_VERSION_MIN) goto out; + svc_name = "quotad"; ret = glusterd_quotadsvc_reconfigure (); if (ret) goto out; + svc_name = "bitd"; ret = glusterd_bitdsvc_reconfigure (); if (ret) goto out; + + svc_name = "scrubber"; ret = glusterd_scrubsvc_reconfigure (); if (ret) goto out; out: - if (ret) - gf_event (EVENT_SVC_RECONFIGURE_FAILED, ""); - + if (ret && svc_name) + gf_event (EVENT_SVC_RECONFIGURE_FAILED, "svc_name=%s", + svc_name); return ret; } -- cgit