diff options
| author | Pranith K <pranithk@gluster.com> | 2011-07-14 08:07:04 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-17 07:45:05 -0700 |
| commit | bfc0e16e43815ab6d6e67f4bd26694ebd72b3360 (patch) | |
| tree | 221eff40a09ce8e42ab6460bc9040d5b5f9f41fb /xlators/cluster/afr/src/afr-transaction.c | |
| parent | 64b2a56ad0f8ddae9ece8696f7d50a3129c145a3 (diff) | |
cluster/afr: Add fresh children along with read-child to inode context
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2840 (files not getting self-healed when the first child goes down)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2840
Diffstat (limited to 'xlators/cluster/afr/src/afr-transaction.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index 7652d3d1e35..b8d2e27a448 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -407,24 +407,31 @@ void afr_update_read_child (call_frame_t *frame, xlator_t *this, inode_t *inode, afr_transaction_type type) { - int curr_read_child = -1; - int new_read_child = -1; + int curr_read_child = -1; + int new_read_child = -1; afr_private_t *priv = NULL; - afr_local_t *local = NULL; - int **pending = NULL; - int idx = 0; + afr_local_t *local = NULL; + int **pending = NULL; + int idx = 0; + int32_t *fresh_children = NULL; + size_t success_count = 0; idx = afr_index_for_transaction_type (type); priv = this->private; local = frame->local; - curr_read_child = afr_read_child (this, inode); + curr_read_child = afr_inode_get_read_ctx (this, inode, NULL); pending = local->pending; + GF_ASSERT (curr_read_child >= 0); + if (pending[curr_read_child][idx] != 0) - return; + goto out; - /* need to set new read_child */ + fresh_children = GF_CALLOC (priv->child_count, sizeof (*fresh_children), + gf_afr_mt_int32_t); + if (!fresh_children) + goto out; for (new_read_child = 0; new_read_child < priv->child_count; new_read_child++) { @@ -435,15 +442,16 @@ afr_update_read_child (call_frame_t *frame, xlator_t *this, inode_t *inode, if (pending[new_read_child][idx] == 0) /* op just failed */ continue; - - break; + fresh_children[success_count] = new_read_child; + success_count++; } - if (new_read_child == priv->child_count) - /* all children uneligible. leave as-is */ - return; - - afr_set_read_child (this, inode, new_read_child); + afr_inode_set_read_ctx (this, inode, fresh_children[0], + fresh_children); +out: + if (fresh_children) + GF_FREE (fresh_children); + return; } |