From bbbc6792d58705a1696f53d5e5f41e86c8345f14 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Fri, 3 Feb 2017 10:51:21 -0500 Subject: glusterd: keep snapshot bricks separate from regular ones The problem here is that a volume's transport options can change, but any snapshots' bricks don't follow along even though they're now incompatible (with respect to multiplexing). This was causing the USS+SSL test to fail. By keeping the snapshot bricks separate (though still potentially multiplexed with other snapshot bricks including those for other volumes) we can ensure that they remain unaffected by changes to their parent volumes. Also fixed various issues with how the test waits (or more precisely didn't) for various events to complete before it continues. Backport of: > Change-Id: Iab4a8a44fac5760373fac36956a3bcc27cf969da > BUG: 1385758 > Reviewed-on: https://review.gluster.org/16544 ` Change-Id: I91c73e3fdf20d23bff15fbfcc03a8a1922acec27 BUG: 1418091 Signed-off-by: Jeff Darcy Reviewed-on: https://review.gluster.org/16597 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Shyamsundar Ranganathan --- tests/volume.rc | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/volume.rc') diff --git a/tests/volume.rc b/tests/volume.rc index 8294c12fcf1..e55a98253b8 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -500,6 +500,7 @@ function volume_exists() { function killall_gluster() { pkill gluster + find $GLUSTERD_WORKDIR -name '*.pid' | xargs rm -f sleep 1 } -- cgit