summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2017-02-08 10:48:55 -0500
committerShyamsundar Ranganathan <srangana@redhat.com>2017-02-09 08:46:45 -0500
commit1e4f9c58a1b013f3f27d515d72d1e76e1a53436e (patch)
treee8f444029fd13b3d599ea5ce2cba32407667d369 /tests/basic
parent9ac193a19b0ca6d6548aeafa5c915b26396f8697 (diff)
trash: fix problem with trash feature under multiplexing
With multiplexing, the trash translator gets a reconfigure call before a notify(CHILD_UP). In this case, priv->trash_itable was not yet initialized, so the reconfigure would get a SEGV. Moving the itable allocation to init seems to fix it, so trash can be reenabled. Change-Id: I21ac2d7fc66bac1bc4ec70fbc8bae306d73ac565 BUG: 1420434 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: https://review.gluster.org/16567 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Anoop C S <anoopcs@redhat.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/multiplex.t4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/basic/multiplex.t b/tests/basic/multiplex.t
index d503bf5a232..cfac357b2f1 100644
--- a/tests/basic/multiplex.t
+++ b/tests/basic/multiplex.t
@@ -18,10 +18,12 @@ function count_brick_pids {
}
TEST glusterd
-TEST $CLI volume set all cluster.brick-multiplex yes
+TEST $CLI volume set all cluster.brick-multiplex on
push_trapfunc "$CLI volume set all cluster.brick-multiplex off"
push_trapfunc "cleanup"
+
TEST $CLI volume create $V0 $H0:$B0/brick{0,1}
+TEST $CLI volume set $V0 features.trash enable
TEST $CLI volume start $V0
# Without multiplexing, there would be two.