From 7dc5d73410f0e9f846c593887637001ca43bc4a0 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 12 May 2016 13:55:44 +0530 Subject: cluster/afr: Handle non-zero source in heal-info decision Problem: Spurious entries are reported in heal info when the mount is on second/third brick of the replica pair because local-child is given preference in selecting source. The code is supposed to suggest the file needs heal if the (source < 0) (failure code path), but instead it is written as if any non-zero value is considered failure. Fix: Treat +ve source as success case BUG: 1335429 Change-Id: I1be7f9defef2ae03be7eec8d7d49bf34adeca82c Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/14302 Reviewed-by: Krutika Dhananjay Reviewed-by: Anuradha Talur Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Ravishankar N CentOS-regression: Gluster Build System --- xlators/cluster/afr/src/afr-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 160170e035c..08186b0bbcb 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -4572,11 +4572,11 @@ out: } gf_boolean_t -afr_decide_heal_info (afr_private_t *priv, unsigned char *sources, int ret) +afr_decide_heal_info (afr_private_t *priv, unsigned char *sources, int source) { int sources_count = 0; - if (ret) + if (source < 0) goto out; sources_count = AFR_COUNT (sources, priv->child_count); -- cgit