From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 16 Jun 2017 06:12:14 +0000 (-0700)
Subject: test/osd/osd-dup.sh: use wait_for_clean
X-Git-Tag: v12.1.0~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30efce5ba02ef8c7f42d93f0918b77cc840abf49;p=ceph.git

test/osd/osd-dup.sh: use wait_for_clean

Rather than a onetime 'ceph -s' test, which might be too early
on a loaded machine, use wait_for_clean; that's its job

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/test/osd/osd-dup.sh b/src/test/osd/osd-dup.sh
index bf48a39ea52..f497005d168 100755
--- a/src/test/osd/osd-dup.sh
+++ b/src/test/osd/osd-dup.sh
@@ -72,7 +72,7 @@ function TEST_filestore_to_bluestore() {
     # and make sure mon is sync'ed
     flush_pg_stats
 
-    ceph -s | grep '20 active+clean' || return 1
+    wait_for_clean || return 1
 }
 
 main osd-dup "$@"