]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: ceph_objectstore_tool.py: kill all daemons 14428/head
authorKefu Chai <kchai@redhat.com>
Sat, 8 Apr 2017 14:27:33 +0000 (22:27 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 10 Apr 2017 11:39:26 +0000 (19:39 +0800)
init-ceph kills all daemons that can be identified by get_name_list() by
default, so no need to list them explicitly. also, without this change,
mgr is not stopped when the test finishes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/test/ceph_objectstore_tool.py

index 2bbe1743b85852f635f26a91886f06e77f01e933..6ed596c8283f812600a57a3b66126ee8414add37 100755 (executable)
@@ -399,7 +399,7 @@ CEPH_DIR = CEPH_BUILD_DIR + "/cot_dir"
 CEPH_CONF = os.path.join(CEPH_DIR, 'ceph.conf')
 
 def kill_daemons():
-    call("{path}/init-ceph -c {conf} stop osd mon > /dev/null 2>&1".format(conf=CEPH_CONF, path=CEPH_BIN), shell=True)
+    call("{path}/init-ceph -c {conf} stop > /dev/null 2>&1".format(conf=CEPH_CONF, path=CEPH_BIN), shell=True)
 
 
 def check_data(DATADIR, TMPFILE, OSDDIR, SPLIT_NAME):