tests: ceph_objectstore_tool.py encapsulate init-ceph stop

Call init-ceph in kill_daemons and add a call to kill_daemon when main
returns on error so that it never leaves daemons hanging.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index 8ce2ac8d9e1672bf014c2bccb44da070fda31fc2..dfeb27f582dac6865378313b1e1289be64ded533 100755 (executable)
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -167,12 +167,16 @@ def verify(DATADIR, POOL, NAME_PREFIX):
             pass
     return ERRORS
 
+CEPH_DIR = "ceph_objectstore_tool_dir"
+CEPH_CONF = os.path.join(CEPH_DIR, 'ceph.conf')
+
+def kill_daemons():
+    call("./init-ceph -c {conf} stop osd mon > /dev/null 2>&1".format(conf=CEPH_CONF), shell=True)
 
 def main(argv):
     sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
     nullfd = open(os.devnull, "w")
 
-    CEPH_DIR = "ceph_objectstore_tool_dir"
     call("rm -fr ceph_objectstore_tool_dir ; mkdir ceph_objectstore_tool_dir", shell=True)
     os.environ["CEPH_DIR"] = CEPH_DIR;
     OSDDIR = os.path.join(CEPH_DIR, "dev")
@@ -205,7 +209,6 @@ def main(argv):
     CFSD_PREFIX = "./ceph_objectstore_tool --data-path " + OSDDIR + "/{osd} --journal-path " + OSDDIR + "/{osd}.journal "
     PROFNAME = "testecprofile"
 
-    CEPH_CONF = os.path.join(CEPH_DIR, 'ceph.conf')
     os.environ['CEPH_CONF'] = CEPH_CONF
     vstart(new=True)
     wait_for_health()
@@ -372,7 +375,7 @@ def main(argv):
 
     logging.debug(db)
 
-    call("./init-ceph -c {conf} stop osd mon".format(conf=CEPH_CONF), shell=True)
+    kill_daemons()
 
     if ERRORS:
         logging.critical("Unable to set up test")
@@ -753,11 +756,8 @@ def main(argv):
     else:
         logging.warning("SKIPPING IMPORT-RADOS TESTS DUE TO PREVIOUS FAILURES")
 
-    call("./init-ceph -c {conf} stop osd mon".format(conf=CEPH_CONF), shell=True)
-
     call("/bin/rm -rf {dir}".format(dir=TESTDIR), shell=True)
     call("/bin/rm -rf {dir}".format(dir=DATADIR), shell=True)
-    call("/bin/rm -fr ceph_objectstore_tool_dir", shell=True)
 
     if ERRORS == 0:
         print "TEST PASSED"
@@ -767,5 +767,10 @@ def main(argv):
         return 1
 
 if __name__ == "__main__":
-    status = main(sys.argv[1:])
+    status = 1
+    try:
+        status = main(sys.argv[1:])
+    finally:
+        kill_daemons()
+        call("/bin/rm -fr ceph_objectstore_tool_dir", shell=True)
     sys.exit(status)