diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2010-07-29 00:46:08 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-28 23:58:09 -0700 |
| commit | cadd1256355f4e1a5bd43c3a71dbd6cb97dff66d (patch) | |
| tree | 56f0843defafbb985e7e9faa73aa74b453e6268a /xlators/cluster/afr/src/afr-dir-read.c | |
| parent | c9b709917b3d549d544133d51e85dbf9287278d1 (diff) | |
fixes for spurious entry self-heal in afr
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 974 (Spurious self-heal?)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=974
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-read.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-read.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 281fc78d3..344bdf74e 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; |