qa/suites/rados: remove luminous tests

- snapdir conversion (at-end) stuff
- merge luminous-specific collections that avoided the above back
into their normal locations

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/basic-luminous/% b/qa/suites/rados/basic-luminous/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/basic-luminous/ceph.yaml b/qa/suites/rados/basic-luminous/ceph.yaml
deleted file mode 120000 (symlink)
index 1e1b9ef..0000000
--- a/qa/suites/rados/basic-luminous/ceph.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../basic/ceph.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/basic-luminous/clusters b/qa/suites/rados/basic-luminous/clusters
deleted file mode 120000 (symlink)
index ae92569..0000000
--- a/qa/suites/rados/basic-luminous/clusters
+++ /dev/null
@@ -1 +0,0 @@
-../basic/clusters
\ No newline at end of file

diff --git a/qa/suites/rados/basic-luminous/objectstore b/qa/suites/rados/basic-luminous/objectstore
deleted file mode 120000 (symlink)
index f81a13b..0000000
--- a/qa/suites/rados/basic-luminous/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../basic/objectstore
\ No newline at end of file

diff --git a/qa/suites/rados/basic-luminous/rados.yaml b/qa/suites/rados/basic-luminous/rados.yaml
deleted file mode 120000 (symlink)
index 9b356bf..0000000
--- a/qa/suites/rados/basic-luminous/rados.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../basic/rados.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/basic-luminous/scrub_test.yaml b/qa/suites/rados/basic-luminous/scrub_test.yaml
deleted file mode 100644 (file)
index d87f5bf..0000000
--- a/qa/suites/rados/basic-luminous/scrub_test.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-overrides:
-  ceph:
-    wait-for-scrub: false
-    log-whitelist:
-    - '!= data_digest'
-    - '!= omap_digest'
-    - '!= size'
-    - 'deep-scrub 0 missing, 1 inconsistent objects'
-    - 'deep-scrub [0-9]+ errors'
-    - 'repair 0 missing, 1 inconsistent objects'
-    - 'repair [0-9]+ errors, [0-9]+ fixed'
-    - 'shard [0-9]+ missing'
-    - 'deep-scrub 1 missing, 1 inconsistent objects'
-    - 'does not match object info size'
-    - 'attr name mistmatch'
-    - 'deep-scrub 1 missing, 0 inconsistent objects'
-    - 'failed to pick suitable auth object'
-    - overall HEALTH_
-    - (OSDMAP_FLAGS)
-    - (OSD_
-    - (PG_
-    - (OSD_SCRUB_ERRORS)
-    - (TOO_FEW_PGS)
-    conf:
-      osd:
-        osd deep scrub update digest min age: 0
-tasks:
-- scrub_test:

diff --git a/qa/suites/rados/basic/d-require-luminous b/qa/suites/rados/basic/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/basic/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/basic/tasks/scrub_test.yaml b/qa/suites/rados/basic/tasks/scrub_test.yaml
new file mode 100644 (file)
index 0000000..d87f5bf
--- /dev/null
+++ b/qa/suites/rados/basic/tasks/scrub_test.yaml
@@ -0,0 +1,28 @@
+overrides:
+  ceph:
+    wait-for-scrub: false
+    log-whitelist:
+    - '!= data_digest'
+    - '!= omap_digest'
+    - '!= size'
+    - 'deep-scrub 0 missing, 1 inconsistent objects'
+    - 'deep-scrub [0-9]+ errors'
+    - 'repair 0 missing, 1 inconsistent objects'
+    - 'repair [0-9]+ errors, [0-9]+ fixed'
+    - 'shard [0-9]+ missing'
+    - 'deep-scrub 1 missing, 1 inconsistent objects'
+    - 'does not match object info size'
+    - 'attr name mistmatch'
+    - 'deep-scrub 1 missing, 0 inconsistent objects'
+    - 'failed to pick suitable auth object'
+    - overall HEALTH_
+    - (OSDMAP_FLAGS)
+    - (OSD_
+    - (PG_
+    - (OSD_SCRUB_ERRORS)
+    - (TOO_FEW_PGS)
+    conf:
+      osd:
+        osd deep scrub update digest min age: 0
+tasks:
+- scrub_test:

diff --git a/qa/suites/rados/monthrash/d-require-luminous b/qa/suites/rados/monthrash/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/monthrash/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-big/d-require-luminous b/qa/suites/rados/thrash-erasure-code-big/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/thrash-erasure-code-big/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous b/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-overwrites/d-require-luminous b/qa/suites/rados/thrash-erasure-code-overwrites/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/thrash-erasure-code-overwrites/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous b/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code/d-require-luminous b/qa/suites/rados/thrash-erasure-code/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/thrash-erasure-code/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/% b/qa/suites/rados/thrash-luminous/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/thrash-luminous/0-size-min-size-overrides b/qa/suites/rados/thrash-luminous/0-size-min-size-overrides
deleted file mode 120000 (symlink)
index ce15740..0000000
--- a/qa/suites/rados/thrash-luminous/0-size-min-size-overrides
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/0-size-min-size-overrides/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/1-pg-log-overrides b/qa/suites/rados/thrash-luminous/1-pg-log-overrides
deleted file mode 120000 (symlink)
index d68d36c..0000000
--- a/qa/suites/rados/thrash-luminous/1-pg-log-overrides
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/1-pg-log-overrides/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/backoff b/qa/suites/rados/thrash-luminous/backoff
deleted file mode 120000 (symlink)
index dc7814b..0000000
--- a/qa/suites/rados/thrash-luminous/backoff
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/backoff/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/ceph.yaml b/qa/suites/rados/thrash-luminous/ceph.yaml
deleted file mode 120000 (symlink)
index a2fd139..0000000
--- a/qa/suites/rados/thrash-luminous/ceph.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/ceph.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/clusters b/qa/suites/rados/thrash-luminous/clusters
deleted file mode 120000 (symlink)
index 729c96f..0000000
--- a/qa/suites/rados/thrash-luminous/clusters
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/clusters/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/msgr b/qa/suites/rados/thrash-luminous/msgr
deleted file mode 120000 (symlink)
index 8113e02..0000000
--- a/qa/suites/rados/thrash-luminous/msgr
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/msgr
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/objectstore b/qa/suites/rados/thrash-luminous/objectstore
deleted file mode 120000 (symlink)
index 38ae00c..0000000
--- a/qa/suites/rados/thrash-luminous/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/objectstore/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/rados.yaml b/qa/suites/rados/thrash-luminous/rados.yaml
deleted file mode 120000 (symlink)
index 2834d2e..0000000
--- a/qa/suites/rados/thrash-luminous/rados.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/rados.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/rocksdb.yaml b/qa/suites/rados/thrash-luminous/rocksdb.yaml
deleted file mode 120000 (symlink)
index 9aaadff..0000000
--- a/qa/suites/rados/thrash-luminous/rocksdb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/rocksdb.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/thrashers b/qa/suites/rados/thrash-luminous/thrashers
deleted file mode 120000 (symlink)
index f461dad..0000000
--- a/qa/suites/rados/thrash-luminous/thrashers
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/thrashers
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/thrashosds-health.yaml b/qa/suites/rados/thrash-luminous/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index ebf7f34..0000000
--- a/qa/suites/rados/thrash-luminous/thrashosds-health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/workloads/redirect.yaml b/qa/suites/rados/thrash-luminous/workloads/redirect.yaml
deleted file mode 100644 (file)
index 50bd812..0000000
--- a/qa/suites/rados/thrash-luminous/workloads/redirect.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    set_redirect: true
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      copy_from: 50

diff --git a/qa/suites/rados/thrash-luminous/workloads/redirect_set_object.yaml b/qa/suites/rados/thrash-luminous/workloads/redirect_set_object.yaml
deleted file mode 100644 (file)
index 74595e2..0000000
--- a/qa/suites/rados/thrash-luminous/workloads/redirect_set_object.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    set_redirect: true
-    op_weights:
-      set_redirect: 100
-      copy_from: 100

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-end.yaml b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
deleted file mode 100644 (file)
index 4e60cd6..0000000
--- a/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# do not require luminous osds at mkfs time; only set flag at
-# the end of the test run, then do a final scrub (to convert any
-# legacy snapsets), and verify we are healthy.
-tasks:
-- full_sequential_finally:
-  - exec:
-      mon.a:
-        - ceph osd require-osd-release luminous
-        - ceph osd pool application enable base rados || true
-# make sure osds have latest map
-        - rados -p rbd bench 5 write -b 4096
-  - ceph.healthy:
-  - ceph.osd_scrub_pgs:
-      cluster: ceph
-  - exec:
-      mon.a:
-        - ceph pg dump -f json-pretty
-        - "ceph pg dump sum -f json-pretty | grep num_legacy_snapsets | head -1 | grep ': 0'"
-overrides:
-  ceph:
-    conf:
-      global:
-        mon debug no require luminous: true
-
-# setting luminous triggers peering, which *might* trigger health alerts
-    log-whitelist:
-      - overall HEALTH_
-      - \(PG_AVAILABILITY\)
-      - \(PG_DEGRADED\)
-  thrashosds:
-    chance_thrash_cluster_full: 0

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/thrash/workloads/redirect.yaml b/qa/suites/rados/thrash/workloads/redirect.yaml
new file mode 100644 (file)
index 0000000..50bd812
--- /dev/null
+++ b/qa/suites/rados/thrash/workloads/redirect.yaml
@@ -0,0 +1,11 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    set_redirect: true
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      copy_from: 50

diff --git a/qa/suites/rados/thrash/workloads/redirect_set_object.yaml b/qa/suites/rados/thrash/workloads/redirect_set_object.yaml
new file mode 100644 (file)
index 0000000..74595e2
--- /dev/null
+++ b/qa/suites/rados/thrash/workloads/redirect_set_object.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    set_redirect: true
+    op_weights:
+      set_redirect: 100
+      copy_from: 100

diff --git a/qa/suites/rados/verify/d-require-luminous b/qa/suites/rados/verify/d-require-luminous
deleted file mode 120000 (symlink)
index 737aee8..0000000
--- a/qa/suites/rados/verify/d-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/d-require-luminous/
\ No newline at end of file