From: Loic Dachary <loic-201408@dachary.org>
Date: Sat, 6 Sep 2014 09:43:10 +0000 (+0200)
Subject: tests: flush logs before grepping them
X-Git-Tag: v0.86~33^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b8c50fe2fafd4635d8cc197e5379952f885f20c;p=ceph.git

tests: flush logs before grepping them

Otherwise the test races with the daemon writing the logs and can
sometime fail.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index b73cd5d44645..4ec4686ec097 100755
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -38,6 +38,7 @@ function TEST_default_deprectated_0() {
     run_mon $dir a --public-addr 127.0.0.1 \
         --osd_pool_default_crush_replicated_ruleset $expected
     ./ceph --format json osd dump | grep '"crush_ruleset":'$expected
+    CEPH_ARGS='' ./ceph --admin-daemon $dir/a/ceph-mon.a.asok log flush || return 1
     ! grep "osd_pool_default_crush_rule is deprecated " $dir/a/log || return 1
 }
 
@@ -48,6 +49,7 @@ function TEST_default_deprectated_1() {
     run_mon $dir a --public-addr 127.0.0.1 \
         --osd_pool_default_crush_rule $expected
     ./ceph --format json osd dump | grep '"crush_ruleset":'$expected
+    CEPH_ARGS='' ./ceph --admin-daemon $dir/a/ceph-mon.a.asok log flush || return 1
     grep "osd_pool_default_crush_rule is deprecated " $dir/a/log || return 1
 }
 
@@ -60,6 +62,7 @@ function TEST_default_deprectated_2() {
         --osd_pool_default_crush_replicated_ruleset $unexpected
     ./ceph --format json osd dump | grep '"crush_ruleset":'$expected
     ! ./ceph --format json osd dump | grep '"crush_ruleset":'$unexpected || return 1
+    CEPH_ARGS='' ./ceph --admin-daemon $dir/a/ceph-mon.a.asok log flush || return 1
     grep "osd_pool_default_crush_rule is deprecated " $dir/a/log || return 1
 }
 
@@ -107,6 +110,7 @@ function TEST_erasure_crush_rule_pending() {
     result=$(echo '{"prefix":"osdmonitor_prepare_command","prepare":"osd crush rule create-erasure","name":"'$crush_ruleset'"}' | nc -U $dir/a/ceph-mon.a.asok | cut --bytes=5-)
     test $result = true || return 1
     ./ceph osd pool create pool_erasure 12 12 erasure default $crush_ruleset || return 1
+    CEPH_ARGS='' ./ceph --admin-daemon $dir/a/ceph-mon.a.asok log flush || return 1
     grep "$crush_ruleset try again" $dir/a/log || return 1
 }