summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/cluster/afr/src/afr-common.c4
-rw-r--r--xlators/nfs/server/src/nfs-fops.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 537b9c206..4157174e4 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1630,6 +1630,7 @@ afr_self_heal_lookup_unwind (call_frame_t *frame, xlator_t *this,
afr_local_t *local = NULL;
int ret = -1;
dict_t *xattr = NULL;
+ int32_t spb = 0;
local = frame->local;
@@ -1661,6 +1662,9 @@ afr_self_heal_lookup_unwind (call_frame_t *frame, xlator_t *this,
local->self_heal.actual_sh_started);
}
+ if (local->loc.inode)
+ spb = afr_is_split_brain (this, local->loc.inode);
+ ret = dict_set_int32 (xattr, "split-brain", spb);
}
out:
AFR_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index df09d22bb..f85f6b2c4 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -385,15 +385,15 @@ nfs_fop_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
struct nfs_fop_local *local = NULL;
fop_lookup_cbk_t progcbk;
- char *sh_fail_val = NULL;
+ int32_t spb = 0;
/*
* With native protocol, self-heal failures would be detected during
* open. NFS doesn't issue that open when revalidating cache, so we
* have to check for failures here instead.
*/
- if (dict_get_str(xattr,"sh-failed",&sh_fail_val) == 0) {
- if (strcmp(sh_fail_val,"1") == 0) {
+ if (dict_get_int32(xattr, "split-brain", &spb) == 0) {
+ if (spb) {
op_ret = -1;
op_errno = EIO;
}