mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-18 10:04:20 +03:00
tests: avoid checking command result in cluster
When running cluster test with clvmd, the actual 'monitoring' happens in cluster - so the 'already monitored' message is also logged within clvmd code and the command cannot see such effect. clvmd was incapable to report this information back to command so it cannot be displayed this way. Add 'lvs -o+seg_monitor' validation which also works in clustered mode.
This commit is contained in:
parent
569e328cc0
commit
d1c5b3ae74
@ -31,10 +31,13 @@ dmeventd -R -f &
|
||||
echo $! >LOCAL_DMEVENTD
|
||||
sleep 2 # wait a bit, so we talk to the new dmeventd later
|
||||
|
||||
check lv_field $vg/3way seg_monitor "monitored"
|
||||
check lv_field $vg/4way seg_monitor "monitored"
|
||||
lvchange --monitor y --verbose $vg/3way 2>&1 | tee lvchange.out
|
||||
grep 'already monitored' lvchange.out
|
||||
# only non-cluster tests can check command result
|
||||
test -e LOCAL_CLVMD || grep 'already monitored' lvchange.out
|
||||
lvchange --monitor y --verbose $vg/4way 2>&1 | tee lvchange.out
|
||||
grep 'already monitored' lvchange.out
|
||||
test -e LOCAL_CLVMD || grep 'already monitored' lvchange.out
|
||||
|
||||
# now try what happens if no dmeventd is running
|
||||
kill -9 "$(< LOCAL_DMEVENTD)"
|
||||
@ -49,11 +52,14 @@ sleep 9
|
||||
not pgrep dmeventd
|
||||
rm LOCAL_DMEVENTD
|
||||
|
||||
check lv_field $vg/3way seg_monitor "not monitored"
|
||||
check lv_field $vg/4way seg_monitor "not monitored"
|
||||
|
||||
lvchange --monitor y --verbose $vg/3way 2>&1 | tee lvchange.out
|
||||
pgrep -o dmeventd >LOCAL_DMEVENTD
|
||||
not grep 'already monitored' lvchange.out
|
||||
test -e LOCAL_CLVMD || not grep 'already monitored' lvchange.out
|
||||
|
||||
lvchange --monitor y --verbose $vg/$lv2 2>&1 | tee lvchange.out
|
||||
not grep 'already monitored' lvchange.out
|
||||
test -e LOCAL_CLVMD || not grep 'already monitored' lvchange.out
|
||||
|
||||
vgremove -ff $vg
|
||||
|
Loading…
x
Reference in New Issue
Block a user