diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2016-05-27 15:47:07 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-06-10 08:36:21 -0700 |
| commit | de56d9591ed94fc6f77e6f97ea6bbfaeae8e19fd (patch) | |
| tree | bef1e8d9a4a843f082029cb8e2f741574dfc88b1 /xlators/cluster/afr/src/afr-dir-write.c | |
| parent | 1a8da06eb3e6adcca730451c5abd1c76efa226dd (diff) | |
cluster/afr: Unwind xdata_rsp even in case of failures
DHT expects GF_PREOP_CHECK_FAILED to be present in xdata_rsp in case of mkdir
failures because of stale layout. But AFR was unwinding null xdata_rsp in case
of failures. This was leading to mkdir failures just after remove-brick. Unwind
the xdata_rsp in case of failures to make sure the response from brick reaches
dht.
>BUG: 1340623
>Change-Id: Idd3f7b95730e8ea987b608e892011ff190e181d1
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
>Reviewed-on: http://review.gluster.org/14553
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Ravishankar N <ravishankar@redhat.com>
>Smoke: Gluster Build System <jenkins@build.gluster.com>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Anuradha Talur <atalur@redhat.com>
>Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
BUG: 1342178
Change-Id: Iaacadcad0f76979fb250bd008b8e43f0e7acf642
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/14617
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-write.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 55aec7429a7..f3de5352d7e 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -101,18 +101,21 @@ __afr_dir_write_finalize (call_frame_t *frame, xlator_t *this) if (local->inode) { afr_replies_interpret (frame, this, local->inode, NULL); inode_read_subvol = afr_data_subvol_get (local->inode, this, - NULL, NULL, &args); + NULL, NULL, NULL, &args); } if (local->parent) parent_read_subvol = afr_data_subvol_get (local->parent, this, - NULL, NULL, NULL); + NULL, local->readable, NULL, NULL); + if (local->parent2) parent2_read_subvol = afr_data_subvol_get (local->parent2, this, - NULL, NULL, NULL); + NULL, local->readable2, NULL, NULL); local->op_ret = -1; local->op_errno = afr_final_errno (local, priv); + afr_pick_error_xdata (local, priv, local->parent, local->readable, + local->parent2, local->readable2); for (i = 0; i < priv->child_count; i++) { if (!local->replies[i].valid) @@ -144,6 +147,11 @@ __afr_dir_write_finalize (call_frame_t *frame, xlator_t *this) local->replies[i].preparent2; local->cont.dir_fop.postnewparent = local->replies[i].postparent2; + if (local->xdata_rsp) { + dict_unref (local->xdata_rsp); + local->xdata_rsp = NULL; + } + if (local->replies[i].xdata) local->xdata_rsp = dict_ref (local->replies[i].xdata); @@ -196,6 +204,9 @@ __afr_dir_write_fill (call_frame_t *frame, xlator_t *this, int child_index, local->replies[child_index].valid = 1; local->replies[child_index].op_ret = op_ret; local->replies[child_index].op_errno = op_errno; + if (xdata) + local->replies[child_index].xdata = dict_ref (xdata); + if (op_ret >= 0) { if (poststat) @@ -208,9 +219,6 @@ __afr_dir_write_fill (call_frame_t *frame, xlator_t *this, int child_index, local->replies[child_index].preparent2 = *preparent2; if (postparent2) local->replies[child_index].postparent2 = *postparent2; - if (xdata) - local->replies[child_index].xdata = dict_ref (xdata); - if (fd_ctx) fd_ctx->opened_on[child_index] = AFR_FD_OPENED; } else { |