From 1e4f9c58a1b013f3f27d515d72d1e76e1a53436e Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Wed, 8 Feb 2017 10:48:55 -0500 Subject: 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 Reviewed-on: https://review.gluster.org/16567 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Anoop C S Reviewed-by: jiffin tony Thottan Reviewed-by: Shyamsundar Ranganathan --- tests/basic/multiplex.t | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') 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. -- cgit