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.h | |
| 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.h')
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 5482dab25b2..c6afbbe20e0 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -426,6 +426,7 @@ typedef struct _afr_local { performed. This is the output of afr_inode_refresh() */ unsigned char *readable; + unsigned char *readable2; /*For rename transaction*/ afr_inode_refresh_cbk_t refreshfn; @@ -860,14 +861,15 @@ afr_inode_read_subvol_type_get (inode_t *inode, xlator_t *this, int type); int afr_read_subvol_get (inode_t *inode, xlator_t *this, int *subvol_p, + unsigned char *readables, int *event_p, afr_transaction_type type, afr_read_subvol_args_t *args); -#define afr_data_subvol_get(i, t, s, e, a) \ - afr_read_subvol_get(i, t, s, e, AFR_DATA_TRANSACTION, a) +#define afr_data_subvol_get(i, t, s, r, e, a) \ + afr_read_subvol_get(i, t, s, r, e, AFR_DATA_TRANSACTION, a) #define afr_metadata_subvol_get(i, t, s, e, a) \ - afr_read_subvol_get(i, t, s, e, AFR_METADATA_TRANSACTION, a) + afr_read_subvol_get(i, t, s, NULL, e, AFR_METADATA_TRANSACTION, a) int afr_inode_refresh (call_frame_t *frame, xlator_t *this, inode_t *inode, |