From d4ac4f3b7885764160d71e5332639c71ecbeb535 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 6 Apr 2021 09:41:09 -0500
Subject: [PATCH] qa/suites/rados/objectstore: separate store_test tests

This takes 5 hours currently.

- Separate out filestore and memstore into separate task (~1 hr)
- Split bluestore into -a and -b (a tests exclude SynethicMatrixC,
  b tests include it)

Signed-off-by: Sage Weil <sage@newdream.net>
---
 .../backends/objectstore-bluestore-a.yaml            | 12 ++++++++++++
 .../backends/objectstore-bluestore-b.yaml            | 12 ++++++++++++
 ...tore.yaml => objectstore-filestore-memstore.yaml} |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 qa/suites/rados/objectstore/backends/objectstore-bluestore-a.yaml
 create mode 100644 qa/suites/rados/objectstore/backends/objectstore-bluestore-b.yaml
 rename qa/suites/rados/objectstore/backends/{objectstore.yaml => objectstore-filestore-memstore.yaml} (83%)

diff --git a/qa/suites/rados/objectstore/backends/objectstore-bluestore-a.yaml b/qa/suites/rados/objectstore/backends/objectstore-bluestore-a.yaml
new file mode 100644
index 00000000000..e2c97d31af5
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/objectstore-bluestore-a.yaml
@@ -0,0 +1,12 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- exec:
+    client.0:
+      - mkdir $TESTDIR/archive/ostest && cd $TESTDIR/archive/ostest && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-bluestore 20" ceph_test_objectstore --gtest_filter=*/2:-*SyntheticMatrixC* --gtest_catch_exceptions=0
+      - rm -rf $TESTDIR/archive/ostest
diff --git a/qa/suites/rados/objectstore/backends/objectstore-bluestore-b.yaml b/qa/suites/rados/objectstore/backends/objectstore-bluestore-b.yaml
new file mode 100644
index 00000000000..eacb5ab44bf
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/objectstore-bluestore-b.yaml
@@ -0,0 +1,12 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- exec:
+    client.0:
+      - mkdir $TESTDIR/archive/ostest && cd $TESTDIR/archive/ostest && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-bluestore 20" ceph_test_objectstore --gtest_filter=*SyntheticMatrixC*/2 --gtest_catch_exceptions=0
+      - rm -rf $TESTDIR/archive/ostest
diff --git a/qa/suites/rados/objectstore/backends/objectstore.yaml b/qa/suites/rados/objectstore/backends/objectstore-filestore-memstore.yaml
similarity index 83%
rename from qa/suites/rados/objectstore/backends/objectstore.yaml
rename to qa/suites/rados/objectstore/backends/objectstore-filestore-memstore.yaml
index b323a0eea85..fc7906e8b6d 100644
--- a/qa/suites/rados/objectstore/backends/objectstore.yaml
+++ b/qa/suites/rados/objectstore/backends/objectstore-filestore-memstore.yaml
@@ -8,5 +8,5 @@ tasks:
 - install:
 - exec:
     client.0:
-      - mkdir $TESTDIR/archive/ostest && cd $TESTDIR/archive/ostest && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-bluestore 20" ceph_test_objectstore --gtest_filter=-*/3 --gtest_catch_exceptions=0
+      - mkdir $TESTDIR/archive/ostest && cd $TESTDIR/archive/ostest && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-bluestore 20" ceph_test_objectstore --gtest_filter=*/1:*/0 --gtest_catch_exceptions=0
       - rm -rf $TESTDIR/archive/ostest