From 50e6fc7fa82aee1bbd8e56bfd81c4b09c4994ed0 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 26 Jul 2016 15:22:25 -0700 Subject: [PATCH] SQUASH fix test_removeall and failure test --- src/test/ceph_objectstore_tool.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 000bf8a8e7a9b3..2e2e12d5163fd9 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -577,7 +577,7 @@ def test_get_set_inc_osdmap(CFSD_PREFIX, osd_path): return errors -def test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR): +def test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR, REP_NAME, NUM_CLONED_REP_OBJECTS): # Test removeall TMPFILE = r"/tmp/tmp.{pid}".format(pid=os.getpid()) nullfd = open(os.devnull, "w") @@ -595,6 +595,11 @@ def test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR): and f.split("_")[0] == basename and f.split("_")[4] == nspace] if not fnames: continue + + if int(basename.split(REP_NAME)[1]) <= int(NUM_CLONED_REP_OBJECTS): + cmd = (CFSD_PREFIX + "'{json}' remove").format(osd=osd, json=JSON) + errors += test_failure(cmd, "Snapshots are present, use removeall to delete everything") + cmd = (CFSD_PREFIX + " --force --dry-run '{json}' remove").format(osd=osd, json=JSON) logging.debug(cmd) ret = call(cmd, shell=True, stdout=nullfd, stderr=nullfd) @@ -1026,9 +1031,6 @@ def main(argv): cmd = (CFSD_PREFIX + "'[\"1.3\",{{\"snapid\":\"not an int\"}}]' list-omap").format(osd=ONEOSD, pg=ONEPG) ERRORS += test_failure(cmd, "Decode object JSON error: value type is 2 not 4") - cmd = (CFSD_PREFIX + "'[\"1.0\", {{\"hash\": 623868980, \"max\": 0, \"oid\": \"REPobject1\", \"namespace\": \"\", \"snapid\": -2, \"key\": \"\", \"pool\": 1}}]' remove").format(osd=ONEOSD) - ERRORS += test_failure(cmd, "Snapshots are present, use removeall to delete everything") - TMPFILE = r"/tmp/tmp.{pid}".format(pid=pid) ALLPGS = OBJREPPGS + OBJECPGS OSDS = get_osds(ALLPGS[0], OSDDIR) @@ -1935,7 +1937,7 @@ def main(argv): call("/bin/rm -rf {dir}".format(dir=TESTDIR), shell=True) call("/bin/rm -rf {dir}".format(dir=DATADIR), shell=True) - ERRORS += test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR) + ERRORS += test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR, REP_NAME, NUM_CLONED_REP_OBJECTS) # vstart() starts 4 OSDs ERRORS += test_get_set_osdmap(CFSD_PREFIX, range(4), ALLOSDS)