From a8d26122dcba74ad7e48ec774be89982f65332e4 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 6 Apr 2018 11:52:10 -0700 Subject: [PATCH] tools: Use --no-mon-config so ceph_objectstore_tool.py test doesn't hang Signed-off-by: David Zafman --- qa/standalone/special/ceph_objectstore_tool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/standalone/special/ceph_objectstore_tool.py b/qa/standalone/special/ceph_objectstore_tool.py index 72ed80da16a3a..ba876dffb9ca7 100755 --- a/qa/standalone/special/ceph_objectstore_tool.py +++ b/qa/standalone/special/ceph_objectstore_tool.py @@ -708,7 +708,7 @@ def main(argv): pid = os.getpid() TESTDIR = "/tmp/test.{pid}".format(pid=pid) DATADIR = "/tmp/data.{pid}".format(pid=pid) - CFSD_PREFIX = CEPH_BIN + "/ceph-objectstore-tool --data-path " + OSDDIR + "/{osd} " + CFSD_PREFIX = CEPH_BIN + "/ceph-objectstore-tool --no-mon-config --data-path " + OSDDIR + "/{osd} " PROFNAME = "testecprofile" os.environ['CEPH_CONF'] = CEPH_CONF @@ -989,7 +989,7 @@ def main(argv): cmd = (CFSD_PREFIX + "--op import --file {FOO}").format(osd=ONEOSD, FOO=OTHERFILE) ERRORS += test_failure(cmd, "file: {FOO}: No such file or directory".format(FOO=OTHERFILE)) - cmd = "{path}/ceph-objectstore-tool --data-path BAD_DATA_PATH --op list".format(osd=ONEOSD, path=CEPH_BIN) + cmd = "{path}/ceph-objectstore-tool --no-mon-config --data-path BAD_DATA_PATH --op list".format(osd=ONEOSD, path=CEPH_BIN) ERRORS += test_failure(cmd, "data-path: BAD_DATA_PATH: No such file or directory") cmd = (CFSD_PREFIX + "--journal-path BAD_JOURNAL_PATH --op list").format(osd=ONEOSD) @@ -1008,11 +1008,11 @@ def main(argv): # Specify a bad --type os.mkdir(OSDDIR + "/fakeosd") - cmd = ("{path}/ceph-objectstore-tool --data-path " + OSDDIR + "/{osd} --type foobar --op list --pgid {pg}").format(osd="fakeosd", pg=ONEPG, path=CEPH_BIN) + cmd = ("{path}/ceph-objectstore-tool --no-mon-config --data-path " + OSDDIR + "/{osd} --type foobar --op list --pgid {pg}").format(osd="fakeosd", pg=ONEPG, path=CEPH_BIN) ERRORS += test_failure(cmd, "Unable to create store of type foobar") # Don't specify a data-path - cmd = "{path}/ceph-objectstore-tool --type memstore --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG, path=CEPH_BIN) + cmd = "{path}/ceph-objectstore-tool --no-mon-config --type memstore --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG, path=CEPH_BIN) ERRORS += test_failure(cmd, "Must provide --data-path") cmd = (CFSD_PREFIX + "--op remove --pgid 2.0").format(osd=ONEOSD) -- 2.39.5