diff options
author | Sage Weil <sage@inktank.com> | 2013-06-20 11:04:26 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-06-20 11:04:26 -0700 |
commit | 5de54f6a79ebee051033b28b3bcb7352d1da0e9b (patch) | |
tree | bccd9b58a7a87fdf8051a70eb6632640d40eca33 | |
parent | d60534b8f59798feaeeaa17adba2a417d7777cbf (diff) | |
download | ceph-5de54f6a79ebee051033b28b3bcb7352d1da0e9b.tar.gz |
a/workunits/cephtool/test.sh: --no-log-to-stderr when examining stderr
We can get random messages to stderror from socket reconnects and such;
discard those if we are looking at stderr in the test.
Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | qa/workunits/cephtool/test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 955a74bac58..c3e6e8e9b4d 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -82,9 +82,9 @@ if ! grep "$mymsg" /tmp/$$; then fi kill $wpid -ceph mds cluster_down 2>&1 | grep "marked mdsmap DOWN" +ceph mds cluster_down --no-log-to-stderr 2>&1 | grep "marked mdsmap DOWN" expect_false ceph mds cluster_down -ceph mds cluster_up 2>&1 | grep "unmarked mdsmap DOWN" +ceph mds cluster_up --no-log-to-stderr 2>&1 | grep "unmarked mdsmap DOWN" expect_false ceph mds cluster_up # XXX is this a reasonable test? @@ -96,7 +96,7 @@ expect_false ceph mds deactivate 2 ceph mds dump # XXX mds fail, but how do you undo it? mdsmapfile=/tmp/mdsmap.$$ -current_epoch=$(ceph mds getmap -o $mdsmapfile 2>&1 | sed 's/.*epoch //') +current_epoch=$(ceph mds getmap -o $mdsmapfile --no-log-to-stderr 2>&1 | sed 's/.*epoch //') [ -s $mdsmapfile ] ((epoch = current_epoch + 1)) ceph mds setmap -i $mdsmapfile $epoch |