qa: specify filestore for misc tests

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8a694fc2f9e75864e064fe591feda9fab943c15e)

diff --git a/qa/standalone/erasure-code/test-erasure-eio.sh b/qa/standalone/erasure-code/test-erasure-eio.sh
index ce037aacafef1f085a978609a0d071489f486cd1..195362cacb967a64957bdcb9618e6c964d3c0aaf 100755 (executable)
--- 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 5b19c0095ef3d2fead735c837c65adcc9a64e7b9..74f07131f12f33a4e451df4edc1b70687bb86eba 100755 (executable)
--- 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_osd $dir 0 || return 1

diff --git a/qa/standalone/osd/osd-rep-recov-eio.sh b/qa/standalone/osd/osd-rep-recov-eio.sh
index 3a478566320be5c691c9fa4022c61c91f1412ed1..f4babde19e0943af8da23b6b9e7e53abbdc019fa 100755 (executable)
--- 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 8b228784ed538943669759a8cfae6b0828cf484c..7d113b1879c7337a679f98714015beadae362b12 100755 (executable)
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -57,6 +57,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 "
 
     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-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index c46eae292db569e1e51b85cce383196ff747d79f..7c5102e324283db5f0e4d48d2d7dd78c6ff51a29 100755 (executable)
--- 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"
 
     local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for func in $funcs ; do

diff --git a/qa/standalone/special/ceph_objectstore_tool.py b/qa/standalone/special/ceph_objectstore_tool.py
index 06053b9f741218af97004cd08842dba415f52fd0..e2df26dc8590d7e7a290f32a8a27d995a6e859a9 100755 (executable)
--- 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/alloc-hint.yaml b/qa/suites/rados/objectstore/alloc-hint.yaml
index d40143c17a78e6341a188059b4fc7d86d0d4922e..047b02fa04eb1d761fab191e06546e62f0769494 100644 (file)
--- a/qa/suites/rados/objectstore/alloc-hint.yaml
+++ b/qa/suites/rados/objectstore/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/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
index f3163c96b555c0221f65c87ce09eb748550d01e5..042bd0657b18a1960928bf9e4d8320d242d6e711 100644 (file)
--- a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ b/qa/suites/rados/objectstore/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 3e246949df428492d22d0f21ee2aca1dd07e0b6f..846e4b633238bd19ccee52000f09ecbb397d2504 100755 (executable)
--- 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