diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2011-07-18 12:30:17 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-10-17 06:13:56 -0700 |
| commit | ab2b2fefdcb10aa29749190b9e908b3bc81d86e5 (patch) | |
| tree | d028703a64e86a9be31ec81f4c5ef4e7465817ee /xlators/cluster/afr/src/afr-self-heal-entry.c | |
| parent | 57abdb20ade542e9f57461ec953dad8ca93b23c7 (diff) | |
cluster/afr: Handle lookups when self-heal is off
Change-Id: Ibc23fef417bcf613850e03dc4dadcc88f89e2b6f
BUG: 2586
Reviewed-on: http://review.gluster.com/59
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-entry.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-entry.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index 0504da17cd1..8c619ff45a5 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -2159,13 +2159,15 @@ afr_sh_entry_fix (call_frame_t *frame, xlator_t *this) goto heal; } - afr_sh_build_pending_matrix (priv, sh->pending_matrix, sh->xattr, - priv->child_count, AFR_ENTRY_TRANSACTION); + afr_build_pending_matrix (priv->pending_key, sh->pending_matrix, + sh->xattr, AFR_ENTRY_TRANSACTION, + priv->child_count); afr_sh_print_pending_matrix (sh->pending_matrix, this); - nsources = afr_sh_mark_sources (sh, priv->child_count, - AFR_SELF_HEAL_ENTRY); + nsources = afr_mark_sources (sh->sources, sh->pending_matrix, sh->buf, + priv->child_count, AFR_SELF_HEAL_ENTRY, + sh->child_success, this->name); if (nsources == 0) { gf_log (this->name, GF_LOG_TRACE, @@ -2176,9 +2178,6 @@ afr_sh_entry_fix (call_frame_t *frame, xlator_t *this) return 0; } - afr_sh_supress_errenous_children (sh->sources, sh->child_errno, - priv->child_count); - source = afr_sh_select_source (sh->sources, priv->child_count); sh->source = source; @@ -2211,6 +2210,8 @@ afr_sh_entry_lookup_cbk (call_frame_t *frame, void *cookie, if (op_ret != -1) { sh->xattr[child_index] = dict_ref (xattr); sh->buf[child_index] = *buf; + sh->child_success[sh->success_count] = child_index; + sh->success_count++; } } UNLOCK (&frame->lock); @@ -2235,9 +2236,11 @@ afr_sh_entry_lookup (call_frame_t *frame, xlator_t *this) int ret = 0; int call_count = 0; int i = 0; + afr_self_heal_t *sh = NULL; priv = this->private; local = frame->local; + sh = &local->self_heal; call_count = afr_up_children_count (priv->child_count, local->child_up); @@ -2257,6 +2260,9 @@ afr_sh_entry_lookup (call_frame_t *frame, xlator_t *this) } } + for (i = 0; i < priv->child_count; i++) + sh->child_success[i] = -1; + sh->success_count = 0; for (i = 0; i < priv->child_count; i++) { if (local->child_up[i]) { STACK_WIND_COOKIE (frame, |