diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-27 10:43:24 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-27 11:10:43 +0200 |
| commit | d3abc25e76d351b1269f55ff524368eb4ddf00b1 (patch) | |
| tree | b772e9a9f551839e9d73aeb44c577c5ed63b7615 | |
| parent | f0a4955eb1e9fe070d10f451d9d296ceb665fbaa (diff) | |
| download | lvm2-d3abc25e76d351b1269f55ff524368eb4ddf00b1.tar.gz | |
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.
| -rw-r--r-- | test/lib/aux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index fedf7261b..53ebd8acd 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -50,7 +50,7 @@ prepare_clvmd() { for i in {1..100} ; do 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 done } @@ -572,8 +572,8 @@ prepare_devs() { test -f LOOP || for d in ${DEVICES[@]}; do blkdiscard "$d" 2>/dev/null || true # ensure disk header is always zeroed - dd if=/dev/zero of="$d" bs=4096 count=1 - wipefs -a "$d" 2>/dev/null || dd if=/dev/zero of="$d" bs=64K count=1 + dd if=/dev/zero of="$d" bs=32k count=1 + wipefs -a "$d" 2>/dev/null || true done #for i in `seq 1 $n`; do |