diff options
Diffstat (limited to 'test/shell/clvmd-restart.sh')
| -rw-r--r-- | test/shell/clvmd-restart.sh | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/test/shell/clvmd-restart.sh b/test/shell/clvmd-restart.sh index 4a9f12e6b..afe48346c 100644 --- a/test/shell/clvmd-restart.sh +++ b/test/shell/clvmd-restart.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011 Red Hat, Inc. All rights reserved. +# Copyright (C) 2011-2015 Red Hat, Inc. All rights reserved. # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions @@ -16,12 +16,27 @@ export LVM_BINARY=lvm . lib/inittest # only clvmd based test, skip otherwise +test -e LOCAL_LVMPOLLD && skip test -e LOCAL_CLVMD || skip read LOCAL_CLVMD < LOCAL_CLVMD -aux prepare_pvs 1 +# TODO read from build, for now hardcoded +CLVMD_SOCKET="/var/run/lvm/clvmd.sock" -vgcreate --clustered y $vg $(cat DEVICES) +restart_clvmd_() { + "$LVM_CLVMD_BINARY" -S + ls -la $CLVMD_SOCKET || true + + for i in $(seq 1 20) ; do + test -S "$CLVMD_SOCKET" && break + sleep .1 + done + # restarted clvmd has the same PID (no fork, only execvp) + NEW_LOCAL_CLVMD=$(pgrep clvmd) + test "$LOCAL_CLVMD" -eq "$NEW_LOCAL_CLVMD" +} + +aux prepare_vg lvcreate -an --zero n -n $lv1 -l1 $vg lvcreate -an --zero n -n $lv2 -l1 $vg @@ -30,19 +45,10 @@ lvcreate -l1 $vg lvchange -aey $vg/$lv1 lvchange -aey $vg/$lv2 -"$LVM_CLVMD_BINARY" -S -sleep .2 -# restarted clvmd has the same PID (no fork, only execvp) -NEW_LOCAL_CLVMD=$(pgrep clvmd) -test "$LOCAL_CLVMD" -eq "$NEW_LOCAL_CLVMD" +restart_clvmd_ # try restart once more - -"$LVM_CLVMD_BINARY" -S -sleep .2 -# restarted clvmd has the same PID (no fork, only execvp) -NEW_LOCAL_CLVMD=$(pgrep clvmd) -test "$LOCAL_CLVMD" -eq "$NEW_LOCAL_CLVMD" +restart_clvmd_ # FIXME: Hmm - how could we test exclusivity is preserved in singlenode ? lvchange -an $vg/$lv1 @@ -55,7 +61,7 @@ vgchange -an $vg # Test what happens after 'reboot' kill "$LOCAL_CLVMD" -while test -e "/var/run/clvmd.pid"; do echo -n .; sleep .1; done # wait for the pid removal +while test -e "$CLVMD_PIDFILE"; do echo -n .; sleep .1; done # wait for the pid removal aux prepare_clvmd vgchange -ay $vg |