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/cluster/afr/src/afr-self-heal-common.c | 5 ++++- xlators/cluster/dht/src/dht-rebalance.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 556bc5d250e..b6720ccfa5c 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1604,6 +1604,7 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this, int i = 0; int valid_cnt = 0; struct iatt first = {0, }; + int first_idx = 0; struct afr_reply *replies = NULL; int ret = -1; @@ -1643,6 +1644,7 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this, valid_cnt++; if (valid_cnt == 1) { first = replies[i].poststat; + first_idx = i; continue; } @@ -1658,7 +1660,8 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this, "type=file;gfid=%s;" "ia_type-%d=%s;ia_type-%d=%s", this->name, - uuid_utoa (replies[i].poststat.ia_gfid), first, + uuid_utoa (replies[i].poststat.ia_gfid), + first_idx, gf_inode_type_to_str (first.ia_type), i, gf_inode_type_to_str (replies[i].poststat.ia_type)); ret = -EIO; diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index e41a59e7bfc..df1bce3d8db 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -149,7 +149,7 @@ dht_send_rebalance_event (xlator_t *this, int cmd, gf_defrag_status_t status) } if (event != EVENT_LAST) { - ret = gf_event (event, "volume=%s", volname); + gf_event (event, "volume=%s", volname); } GF_FREE (tmpstr); -- cgit