diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-10-16 06:23:29 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-10-20 01:44:36 -0700 |
| commit | 7945121dda340ec8f25711b2ad3ca70b544de967 (patch) | |
| tree | 7449e14f04ede728b9929e9bd6b6d53a386d3406 /xlators/cluster/afr/src/afr-transaction.c | |
| parent | cddc75e242140f8485e2377ce4e6dffe23123744 (diff) | |
afr: do not wind write if pre-op fails on all children
1. When winding the pre-op, transaction.pre_op[i] is set. If the pre-op fails,
transaction.failed_subvols[i] is set. If if fails on all chidren, we can
directly proceed to unlock (via afr_changelog_post_op_now) without trying
to wind the write, fail and then go to unlock.
2. 'fop_subvols' seems to be an unused variable, hence removing it.
Change-Id: I9525628daf48082e979b0093fa0478934495e61f
BUG: 1272362
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/12368
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Anuradha Talur <atalur@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-transaction.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index 915b68ef07d..81d5deeb019 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -44,12 +44,16 @@ __afr_txn_write_fop (call_frame_t *frame, xlator_t *this) afr_local_t *local = NULL; afr_private_t *priv = NULL; int call_count = -1; + unsigned char *failed_subvols = NULL; int i = 0; local = frame->local; priv = this->private; - call_count = AFR_COUNT (local->transaction.pre_op, priv->child_count); + failed_subvols = local->transaction.failed_subvols; + + call_count = priv->child_count - AFR_COUNT (failed_subvols, + priv->child_count); if (call_count == 0) { local->transaction.resume (frame, this); |