From: Kefu Chai Date: Wed, 12 Apr 2017 09:31:52 +0000 (+0800) Subject: qa/workunits/ceph-helpers: do not error out if is_clean X-Git-Tag: v11.2.1~115^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=977770d828252c25004cb6344c43d85abd8ee6f5;p=ceph.git qa/workunits/ceph-helpers: do not error out if is_clean it would be a race otherwise, because we cannot be sure that the cluster pgs are not all clean or not when run_osd() returns, but we can be sure that they are expected to active+clean after a while. that's what wait_for_clean() does. Signed-off-by: Kefu Chai (cherry picked from commit 6cb4503a40ae4ebee5690fda024cae8d1a506bce) --- diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh index e0896ef0b9f..d0e7c005cb2 100755 --- a/qa/workunits/ceph-helpers.sh +++ b/qa/workunits/ceph-helpers.sh @@ -1066,7 +1066,6 @@ function test_is_clean() { setup $dir || return 1 run_mon $dir a --osd_pool_default_size=1 || return 1 run_osd $dir 0 || return 1 - ! is_clean || return 1 wait_for_clean || return 1 is_clean || return 1 teardown $dir || return 1