From 8a694fc2f9e75864e064fe591feda9fab943c15e Mon Sep 17 00:00:00 2001 From: Vikhyat Umrao Date: Tue, 23 Oct 2018 15:51:00 -0700 Subject: [PATCH] qa: specify filestore for misc tests Signed-off-by: Vikhyat Umrao Signed-off-by: Sage Weil --- qa/standalone/erasure-code/test-erasure-eio.sh | 1 + qa/standalone/mon/osd-pool-create.sh | 1 + qa/standalone/osd/osd-rep-recov-eio.sh | 1 + qa/standalone/scrub/osd-scrub-repair.sh | 1 + qa/standalone/scrub/osd-scrub-snaps.sh | 2 +- qa/standalone/special/ceph_objectstore_tool.py | 7 +++++++ qa/suites/rados/objectstore/backends/alloc-hint.yaml | 1 + .../rados/objectstore/backends/ceph_objectstore_tool.yaml | 2 ++ qa/workunits/rados/test_alloc_hint.sh | 1 + 9 files changed, 16 insertions(+), 1 deletion(-) diff --git a/qa/standalone/erasure-code/test-erasure-eio.sh b/qa/standalone/erasure-code/test-erasure-eio.sh index 6a58bb83e13..9928877a20b 100755 --- a/qa/standalone/erasure-code/test-erasure-eio.sh +++ b/qa/standalone/erasure-code/test-erasure-eio.sh @@ -26,6 +26,7 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " + CEPH_ARGS+="--osd-objectstore=filestore " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do diff --git a/qa/standalone/mon/osd-pool-create.sh b/qa/standalone/mon/osd-pool-create.sh index e41bc6494d9..992cbf583aa 100755 --- a/qa/standalone/mon/osd-pool-create.sh +++ b/qa/standalone/mon/osd-pool-create.sh @@ -213,6 +213,7 @@ function TEST_pool_create_rep_expected_num_objects() { setup $dir || return 1 # disable pg dir merge + CEPH_ARGS+="--osd-objectstore=filestore" export CEPH_ARGS run_mon $dir a || return 1 run_mgr $dir x || return 1 diff --git a/qa/standalone/osd/osd-rep-recov-eio.sh b/qa/standalone/osd/osd-rep-recov-eio.sh index cf2a4813de0..0c6fb1bc7d0 100755 --- a/qa/standalone/osd/osd-rep-recov-eio.sh +++ b/qa/standalone/osd/osd-rep-recov-eio.sh @@ -27,6 +27,7 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " + CEPH_ARGS+="--osd-objectstore=filestore " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 0064d11e656..ae2c718f1f0 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -56,6 +56,7 @@ function run() { CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " CEPH_ARGS+="--osd-skip-data-digest=false " + CEPH_ARGS+="--osd-objectstore=filestore " export -n CEPH_CLI_TEST_DUP_COMMAND local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index dddf603de9f..4ed94fea691 100755 --- a/qa/standalone/scrub/osd-scrub-snaps.sh +++ b/qa/standalone/scrub/osd-scrub-snaps.sh @@ -30,7 +30,7 @@ function run() { export CEPH_MON="127.0.0.1:7121" # git grep '\<7121\>' : there must be only one export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " - CEPH_ARGS+="--mon-host=$CEPH_MON " + CEPH_ARGS+="--mon-host=$CEPH_MON --osd-objectstore=filestore" export -n CEPH_CLI_TEST_DUP_COMMAND local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} diff --git a/qa/standalone/special/ceph_objectstore_tool.py b/qa/standalone/special/ceph_objectstore_tool.py index a0f2cb46319..ec412c6bd18 100755 --- a/qa/standalone/special/ceph_objectstore_tool.py +++ b/qa/standalone/special/ceph_objectstore_tool.py @@ -72,6 +72,7 @@ def get_pool_id(name, nullfd): # return a list of unique PGS given an osd subdirectory def get_osd_pgs(SUBDIR, ID): + export CEPH_ARGS="--osd-objectstore=filestore" PGS = [] if ID: endhead = re.compile("{id}.*_head$".format(id=ID)) @@ -83,6 +84,7 @@ def get_osd_pgs(SUBDIR, ID): # return a sorted list of unique PGs given a directory def get_pgs(DIR, ID): + export CEPH_ARGS="--osd-objectstore=filestore" OSDS = [f for f in os.listdir(DIR) if os.path.isdir(os.path.join(DIR, f)) and f.find("osd") == 0] PGS = [] for d in OSDS: @@ -93,6 +95,7 @@ def get_pgs(DIR, ID): # return a sorted list of PGS a subset of ALLPGS that contain objects with prefix specified def get_objs(ALLPGS, prefix, DIR, ID): + export CEPH_ARGS="--osd-objectstore=filestore" OSDS = [f for f in os.listdir(DIR) if os.path.isdir(os.path.join(DIR, f)) and f.find("osd") == 0] PGS = [] for d in OSDS: @@ -111,6 +114,7 @@ def get_objs(ALLPGS, prefix, DIR, ID): # return a sorted list of OSDS which have data from a given PG def get_osds(PG, DIR): + export CEPH_ARGS="--osd-objectstore=filestore" ALLOSDS = [f for f in os.listdir(DIR) if os.path.isdir(os.path.join(DIR, f)) and f.find("osd") == 0] OSDS = [] for d in ALLOSDS: @@ -407,6 +411,7 @@ def kill_daemons(): def check_data(DATADIR, TMPFILE, OSDDIR, SPLIT_NAME): + export CEPH_ARGS="--osd-objectstore=filestore" repcount = 0 ERRORS = 0 for rawnsfile in [f for f in os.listdir(DATADIR) if f.split('-')[1].find(SPLIT_NAME) == 0]: @@ -598,6 +603,7 @@ def test_get_set_inc_osdmap(CFSD_PREFIX, osd_path): def test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR, REP_NAME, NUM_CLONED_REP_OBJECTS): + export CEPH_ARGS="--osd-objectstore=filestore" # Test removeall TMPFILE = r"/tmp/tmp.{pid}".format(pid=os.getpid()) nullfd = open(os.devnull, "w") @@ -667,6 +673,7 @@ def test_removeall(CFSD_PREFIX, db, OBJREPPGS, REP_POOL, CEPH_BIN, OSDDIR, REP_N def main(argv): + export CEPH_ARGS="--osd-objectstore=filestore" if sys.version_info[0] < 3: sys.stdout = stdout = os.fdopen(sys.stdout.fileno(), 'wb', 0) else: diff --git a/qa/suites/rados/objectstore/backends/alloc-hint.yaml b/qa/suites/rados/objectstore/backends/alloc-hint.yaml index d40143c17a7..047b02fa04e 100644 --- a/qa/suites/rados/objectstore/backends/alloc-hint.yaml +++ b/qa/suites/rados/objectstore/backends/alloc-hint.yaml @@ -11,6 +11,7 @@ overrides: conf: osd: filestore xfs extsize: true + osd objectstore: filestore tasks: - install: diff --git a/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml index f3163c96b55..042bd0657b1 100644 --- a/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml +++ b/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml @@ -12,6 +12,8 @@ tasks: global: osd max object name len: 460 osd max object namespace len: 64 + osd: + osd objectstore: filestore log-whitelist: - overall HEALTH_ - \(OSDMAP_FLAGS\) diff --git a/qa/workunits/rados/test_alloc_hint.sh b/qa/workunits/rados/test_alloc_hint.sh index ac7877ddaab..2323915fce7 100755 --- a/qa/workunits/rados/test_alloc_hint.sh +++ b/qa/workunits/rados/test_alloc_hint.sh @@ -51,6 +51,7 @@ function setup_pgid() { } function expect_alloc_hint_eq() { + export CEPH_ARGS="--osd-objectstore=filestore" local expected_extsize="$1" for (( i = 0 ; i < "${NUM_OSDS}" ; i++ )); do -- 2.39.5