diff options
author | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-03-04 20:26:51 -0800 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-03-05 02:47:10 -0800 |
commit | 35cd7053eaf7b41046a505247388a0724b74c3c7 (patch) | |
tree | 2aa02da033beddb8c5bbd9b117522dc301790c12 | |
parent | ad0b1253b9d74797620c493184818685c024f17c (diff) |
Revert "afr: do not set arbiter as a readable subvol in inode context"
This reverts commit ad0b1253b9d74797620c493184818685c024f17c.
Change-Id: Id43ba8e75d58325f897e15e3f64f9389236adb40
Reviewed-on: http://review.gluster.org/13608
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
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>
-rw-r--r-- | tests/basic/afr/arbiter.t | 9 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/tests/basic/afr/arbiter.t b/tests/basic/afr/arbiter.t index a04dfc560ef..be8f676d1ec 100644 --- a/tests/basic/afr/arbiter.t +++ b/tests/basic/afr/arbiter.t @@ -20,7 +20,6 @@ TEST $CLI volume delete $V0 # Create and mount a replica 3 arbiter volume. TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/${V0}{0,1,2} TEST $CLI volume set $V0 performance.write-behind off -TEST $CLI volume set $V0 performance.stat-prefetch off TEST $CLI volume set $V0 cluster.self-heal-daemon off TEST $CLI volume start $V0 TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0; @@ -41,11 +40,9 @@ TEST kill_brick $V0 $H0 $B0/${V0}1 echo "B2 is down, B3 is the only source, writes will fail" >> $M0/file EXPECT_NOT "0" echo $? TEST ! cat $M0/file -# Though metadata IO could have been served from arbiter, we do not allow it -# anymore as FOPS like getfattr could be overloaded to return iatt buffers for -# use by other translators. -TEST ! getfattr -n user.name $M0/file -TEST ! setfattr -n user.name -v value3 $M0/file +# Metadata I/O should still succeed. +TEST getfattr -n user.name $M0/file +TEST setfattr -n user.name -v value3 $M0/file #shd should not data self-heal from arbiter to the sinks. TEST $CLI volume set $V0 cluster.self-heal-daemon on diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 4dd5d74a16b..96ed41d3abf 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -692,10 +692,6 @@ afr_replies_interpret (call_frame_t *frame, xlator_t *this, inode_t *inode) data_readable[i] = 1; metadata_readable[i] = 1; } - if (AFR_IS_ARBITER_BRICK (priv, ARBITER_BRICK_INDEX)) { - data_readable[ARBITER_BRICK_INDEX] = 0; - metadata_readable[ARBITER_BRICK_INDEX] = 0; - } for (i = 0; i < priv->child_count; i++) { if (!replies[i].valid) { @@ -1793,10 +1789,6 @@ unwind: read_subvol = spb_choice; else read_subvol = afr_first_up_child (frame, this); - if (AFR_IS_ARBITER_BRICK (priv, read_subvol)) { - local->op_ret = -1; - local->op_errno = ENOTCONN; - } } par_read_subvol = afr_get_parent_read_subvol (this, parent, replies, readable); |