summaryrefslogtreecommitdiffstats
path: root/tests/volume.rc
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2017-02-03 10:51:21 -0500
committerJeff Darcy <jdarcy@redhat.com>2017-02-10 08:16:48 -0500
commitf1c6ae24361b1bf39794a34ea35a0202a6b49fa6 (patch)
tree92a7072ef677443ee45bde29b2041e3063fb6347 /tests/volume.rc
parent421a098d2acfd4b837d4c03ea6f69987c670d3f7 (diff)
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. Change-Id: Iab4a8a44fac5760373fac36956a3bcc27cf969da BUG: 1385758 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: https://review.gluster.org/16544 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: Avra Sengupta <asengupt@redhat.com> Tested-by: Avra Sengupta <asengupt@redhat.com>
Diffstat (limited to 'tests/volume.rc')
-rw-r--r--tests/volume.rc1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index 3a649e8..f76f37a 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
}