diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-11-01 15:46:16 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-11-01 15:56:03 +0100 |
| commit | df00a62fd0a4a4f8a57ac34a80b37ddfb6e98d74 (patch) | |
| tree | 2c864babc857b196a03410975b40ef131885d65f | |
| parent | 796efef15e048abe4122e7348b22b45d0b73b5bf (diff) | |
| download | lvm2-df00a62fd0a4a4f8a57ac34a80b37ddfb6e98d74.tar.gz | |
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.
| -rw-r--r-- | test/shell/dmeventd-restart.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/shell/dmeventd-restart.sh b/test/shell/dmeventd-restart.sh index 65f1655d9..7d1d253df 100644 --- a/test/shell/dmeventd-restart.sh +++ b/test/shell/dmeventd-restart.sh @@ -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 7 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 |