summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/cluster/afr/src/afr-common.c4
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-data.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index aa88d609837..30986b589c8 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -700,7 +700,7 @@ afr_lookup_set_read_child (xlator_t *this, afr_local_t *local)
if (!sh->sources)
goto out;
- read_child = priv->read_child;
+ read_child = local->read_child_index;
if (afr_is_valid_read_child (sh->sources, priv->child_count,
read_child))
goto out;
@@ -931,6 +931,8 @@ afr_fresh_lookup_cbk (call_frame_t *frame, void *cookie,
afr_set_read_child (this,
local->cont.lookup.inode,
child_index);
+ //prefer fast child
+ local->read_child_index = child_index;
}
} else {
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index 7da6d828e2d..f6def0afab9 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -701,6 +701,7 @@ afr_self_heal_find_sources (xlator_t *this, afr_local_t *local, dict_t **xattr,
afr_private_t *priv = NULL;
int i = 0;
afr_self_heal_type sh_type = AFR_SELF_HEAL_DATA;
+ int nsources = 0;
sh = &local->self_heal;
priv = this->private;
@@ -733,7 +734,11 @@ afr_self_heal_find_sources (xlator_t *this, afr_local_t *local, dict_t **xattr,
sh_type = AFR_SELF_HEAL_METADATA;
break;
}
- (void)afr_sh_mark_sources (sh, priv->child_count, sh_type);
+ nsources = afr_sh_mark_sources (sh, priv->child_count, sh_type);
+ if (nsources == 0) {
+ for (i = 0; i < priv->child_count; i++)
+ sh->sources[i] = 1;
+ }
}