diff options
author | Pranith Kumar K <pranithk@gluster.com> | 2012-03-14 17:05:23 +0530 |
---|---|---|
committer | Vijay Bellur <vijay@gluster.com> | 2012-03-14 05:14:56 -0700 |
commit | 410b1092e690c4e89d95d8b136884df6fcf5a1a8 (patch) | |
tree | e706ff1e4c87a569d3681468df56fdcb3fbacecd /xlators/cluster/afr/src/afr-self-heal-data.c | |
parent | 5ce988633d51ff10f24c03a0e4d3c7c101e43af5 (diff) |
cluster/afr: Perform conservative merge on dir with xattr split-brainv3.2.6p3
Change-Id: I314cf7bbc8a451e42b6addf367f55e431ab0a85c
BUG: 802637
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/2945
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-data.c')
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 7e97cf8cb42..3762a2742fd 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -815,12 +815,23 @@ afr_lookup_select_read_child_by_txn_type (xlator_t *this, afr_local_t *local, if (subvol_status & SPLIT_BRAIN) { gf_log (this->name, GF_LOG_WARNING, "%s: Possible split-brain", local->loc.path); - if (txn_type == AFR_DATA_TRANSACTION) { - //succeed lookup fail open - afr_set_split_brain (this, local->cont.lookup.inode, + switch (txn_type) { + case AFR_DATA_TRANSACTION: + afr_set_split_brain (this, + local->cont.lookup.inode, _gf_true); nsources = 1; sources[success_children[0]] = 1; + break; + case AFR_ENTRY_TRANSACTION: + read_child = afr_get_no_xattr_dir_read_child (this, + success_children, + bufs); + sources[read_child] = 1; + nsources = 1; + break; + default: + break; } } if (nsources < 0) { |