]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: ceph_objectstore_tool.py can use a WARN cluster
authorLoic Dachary <ldachary@redhat.com>
Thu, 13 Nov 2014 16:16:41 +0000 (17:16 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sat, 15 Nov 2014 22:27:15 +0000 (23:27 +0100)
The tests do not need HEALTH_OK exclusively, a HEALTH_WARN cluster can
also run them successfully.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/test/ceph_objectstore_tool.py

index 8a7fc02e61acfb264aa12bb47680aade52f8f57a..cd4c59b51edfc384f3acc1e3cbc9c38db6db6fce 100755 (executable)
@@ -15,7 +15,7 @@ logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.WARNING)
 
 def wait_for_health():
     print "Wait for health_ok...",
-    while call("./ceph health 2> /dev/null | grep -v HEALTH_OK > /dev/null", shell=True) == 0:
+    while call("./ceph health 2> /dev/null | grep -v 'HEALTH_OK\|HEALTH_WARN' > /dev/null", shell=True) == 0:
         time.sleep(5)
     print "DONE"