RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: ceph_objectstore_tool.py encapsulate init-ceph stop

Browse Source 
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>
This commit is contained in:
Loic Dachary 2014-11-13 19:15:50 +01:00
parent 0f3d7b1315
commit fc435ff362
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/ceph_objectstore_tool.py
View File

@ -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)