diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2018-01-30 20:59:23 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-02-06 14:25:31 +0000 |
| commit | 0e6e25ae9e11a15771da796eff211ef1f1c43684 (patch) | |
| tree | 3a2fa9a97baaae69461abc6a19cc516ec747fbba /xlators | |
| parent | 28c306026982d559827c9dfa6ac3066dd5cd4ca1 (diff) | |
afr: capture the correct errno in post-op quorum check
If the post-op phase of txn did not meet quorm checks, use that errno to
unwind the FOP rather than blindly setting ENOTCONN.
Change-Id: I0cb0c8771ec75a45f9a25ad4cd8601103deddf0c
BUG: 1542382
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
(cherry picked from commit 440a048f24b006c80af3d7bcd0a1f13fe3459d87)
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index b72afc80947..3e5326b7753 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -534,8 +534,8 @@ afr_lock_server_count (afr_private_t *priv, afr_transaction_type type) /* {{{ pending */ -gf_boolean_t -afr_post_op_has_quorum (afr_local_t *local, xlator_t *this) +void +afr_handle_post_op_quorum (afr_local_t *local, xlator_t *this) { afr_private_t *priv = NULL; int i = 0; @@ -551,10 +551,13 @@ afr_post_op_has_quorum (afr_local_t *local, xlator_t *this) } if (afr_has_quorum (post_op_children, this)) { - return _gf_true; + return; } - return _gf_false; + local->op_ret = -1; + /*local->op_errno is already captured in post-op callback.*/ + + return; } int @@ -569,10 +572,7 @@ afr_changelog_post_op_done (call_frame_t *frame, xlator_t *this) int_lock = &local->internal_lock; /* Fail the FOP if post-op did not succeed on quorum no. of bricks. */ - if (!afr_post_op_has_quorum (local, this)) { - local->op_ret = -1; - local->op_errno = ENOTCONN; - } + afr_handle_post_op_quorum (local, this); if (local->transaction.resume_stub) { call_resume (local->transaction.resume_stub); |