From cadd1256355f4e1a5bd43c3a71dbd6cb97dff66d Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 29 Jul 2010 00:46:08 +0000 Subject: fixes for spurious entry self-heal in afr Signed-off-by: Pranith Kumar K Signed-off-by: Anand V. Avati BUG: 974 (Spurious self-heal?) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=974 --- xlators/cluster/afr/src/afr-dir-read.c | 12 ++++++++---- xlators/cluster/afr/src/afr-self-heal-entry.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 281fc78d3cd..344bdf74ece 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -69,7 +69,8 @@ afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this) gf_boolean_t -__checksums_differ (uint32_t *checksum, int child_count) +__checksums_differ (uint32_t *checksum, int child_count, + unsigned char *child_up) { int ret = _gf_false; int i = 0; @@ -78,14 +79,16 @@ __checksums_differ (uint32_t *checksum, int child_count) cksum = checksum[0]; - while (i < child_count) { + for (i = 0; i < child_count; i++) { + if (!child_up[i]) + continue; + if (cksum != checksum[i]) { ret = _gf_true; break; } cksum = checksum[i]; - i++; } return ret; @@ -151,7 +154,8 @@ out: if (call_count == 0) { if (__checksums_differ (local->cont.opendir.checksum, - priv->child_count)) { + priv->child_count, + local->child_up)) { sh->need_entry_self_heal = _gf_true; sh->forced_merge = _gf_true; diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index dcb8d0d71df..a4bab4208de 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -616,7 +616,7 @@ afr_sh_entry_expunge_mkdir_cbk (call_frame_t *expunge_frame, void *cookie, xlato frame = expunge_sh->sh_frame; if (op_ret != 0) { - gf_log (this->name, GF_LOG_DEBUG, + gf_log (this->name, GF_LOG_ERROR, "mkdir of /" GF_REPLICATE_TRASH_DIR " failed on %s", priv->children[active_src]->name); -- cgit