mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-10 16:58:47 +03:00
tests: check for clmvd socket
A bit hacky since it expects PID_DIR == DEFAULT_RUN_DIR for now, just to check whether it fixes startup clvmd sync problem.
This commit is contained in:
parent
f0a4955eb1
commit
d3abc25e76
@ -50,7 +50,7 @@ prepare_clvmd() {
|
|||||||
|
|
||||||
for i in {1..100} ; do
|
for i in {1..100} ; do
|
||||||
test $i -eq 100 && die "Startup of clvmd is too slow."
|
test $i -eq 100 && die "Startup of clvmd is too slow."
|
||||||
test -e "$CLVMD_PIDFILE" && break
|
test -e "$CLVMD_PIDFILE" -a -e "${CLVMD_PIDFILE%/*}/lvm/clvmd.sock" && break
|
||||||
sleep .2
|
sleep .2
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -572,8 +572,8 @@ prepare_devs() {
|
|||||||
test -f LOOP || for d in ${DEVICES[@]}; do
|
test -f LOOP || for d in ${DEVICES[@]}; do
|
||||||
blkdiscard "$d" 2>/dev/null || true
|
blkdiscard "$d" 2>/dev/null || true
|
||||||
# ensure disk header is always zeroed
|
# ensure disk header is always zeroed
|
||||||
dd if=/dev/zero of="$d" bs=4096 count=1
|
dd if=/dev/zero of="$d" bs=32k count=1
|
||||||
wipefs -a "$d" 2>/dev/null || dd if=/dev/zero of="$d" bs=64K count=1
|
wipefs -a "$d" 2>/dev/null || true
|
||||||
done
|
done
|
||||||
|
|
||||||
#for i in `seq 1 $n`; do
|
#for i in `seq 1 $n`; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user