qa/suites/crimson-rados: update clusters dir

* Introduce qa/clusters/crimson
  4 deployment clusters (1/2/3/4 nodes) options same as classic.

* Symlink all cluster dirs to the common dir above
  For now keep using only 1/2, we could add 3/4 later on.

* Move to "crimson cpu num" instead of specifying
  "crimson cpu set" set.
  - We expect users to mostly use this option for deploying
    clusters, so use this as testing default.

* remove "crimson bluestore cpu set" which is responsible for
  cpu pinning exclusiveness in seastar/alien cores.

* ignore "for optimal performance" cluster warning now that we
  no longer pin cpus for testing.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/qa/clusters/crimson/crimson-fixed-1.yaml b/qa/clusters/crimson/crimson-fixed-1.yaml
new file mode 100644 (file)
index 0000000..74e8755
--- /dev/null
+++ b/qa/clusters/crimson/crimson-fixed-1.yaml
@@ -0,0 +1,22 @@
+overrides:
+  ceph-deploy:
+    conf:
+      global:
+        osd pool default size: 2
+        osd crush chooseleaf type: 0
+        osd pool default pg num:  128
+        osd pool default pgp num:  128
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+        crimson cpu num: 2
+      global:
+        ms cluster mode: crc
+        ms service mode: crc
+        ms client mode: crc
+        ms mon service mode: crc
+        ms mon cluster mode: crc
+        ms mon client mode: crc
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]

diff --git a/qa/clusters/crimson/crimson-fixed-2.yaml b/qa/clusters/crimson/crimson-fixed-2.yaml
new file mode 100644 (file)
index 0000000..02c3a9b
--- /dev/null
+++ b/qa/clusters/crimson/crimson-fixed-2.yaml
@@ -0,0 +1,16 @@
+roles:
+- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
+- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+        crimson cpu num: 3
+      global:
+        ms cluster mode: crc
+        ms service mode: crc
+        ms client mode: crc
+        ms mon service mode: crc
+        ms mon cluster mode: crc
+        ms mon client mode: crc

diff --git a/qa/clusters/crimson/crimson-fixed-3.yaml b/qa/clusters/crimson/crimson-fixed-3.yaml
new file mode 100644 (file)
index 0000000..2c90f11
--- /dev/null
+++ b/qa/clusters/crimson/crimson-fixed-3.yaml
@@ -0,0 +1,17 @@
+roles:
+- [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, mgr.y, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+        crimson cpu num: 3
+      global:
+        ms cluster mode: crc
+        ms service mode: crc
+        ms client mode: crc
+        ms mon service mode: crc
+        ms mon cluster mode: crc
+        ms mon client mode: crc

diff --git a/qa/clusters/crimson/crimson-fixed-4.yaml b/qa/clusters/crimson/crimson-fixed-4.yaml
new file mode 100644 (file)
index 0000000..220e432
--- /dev/null
+++ b/qa/clusters/crimson/crimson-fixed-4.yaml
@@ -0,0 +1,18 @@
+roles:
+- [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
+- [mon.b, osd.1, osd.5, osd.9, osd.13]
+- [mon.c, osd.2, osd.6, osd.10, osd.14]
+- [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+        crimson cpu num: 3
+      global:
+        ms cluster mode: crc
+        ms service mode: crc
+        ms client mode: crc
+        ms mon service mode: crc
+        ms mon cluster mode: crc
+        ms mon client mode: crc

diff --git a/qa/suites/crimson-rados/basic/clusters/crimson-fixed-2.yaml b/qa/suites/crimson-rados/basic/clusters/crimson-fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..412e394
--- /dev/null
+++ b/qa/suites/crimson-rados/basic/clusters/crimson-fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml b/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
deleted file mode 100644 (file)
index c8dc2a2..0000000
--- a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-2
-      osd.1:
-        crimson cpu set: 3-5
-      osd.2:
-        crimson cpu set: 0-2
-      osd.3:
-        crimson cpu set: 3-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc

diff --git a/qa/suites/crimson-rados/perf/clusters/crimson-fixed-2.yaml b/qa/suites/crimson-rados/perf/clusters/crimson-fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..412e394
--- /dev/null
+++ b/qa/suites/crimson-rados/perf/clusters/crimson-fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml b/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
deleted file mode 100644 (file)
index 0c7c972..0000000
--- a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
-overrides:
-  ceph:
-    log-ignorelist:
-      - \(PG_
-      - \(OSD_
-      - \(OBJECT_
-      - overall HEALTH
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-2
-      osd.1:
-        crimson cpu set: 3-5
-      osd.2:
-        crimson cpu set: 0-2
-      osd.3:
-        crimson cpu set: 3-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc

diff --git a/qa/suites/crimson-rados/rbd/clusters/crimson-fixed-1.yaml b/qa/suites/crimson-rados/rbd/clusters/crimson-fixed-1.yaml
new file mode 120000 (symlink)
index 0000000..4b4e003
--- /dev/null
+++ b/qa/suites/crimson-rados/rbd/clusters/crimson-fixed-1.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-1.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml b/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
deleted file mode 100644 (file)
index 4eaf3dd..0000000
--- a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-overrides:
-  ceph-deploy:
-    conf:
-      global:
-        osd pool default size: 2
-        osd crush chooseleaf type: 0
-        osd pool default pg num:  128
-        osd pool default pgp num:  128
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-1
-      osd.1:
-        crimson cpu set: 2-3
-      osd.2:
-        crimson cpu set: 4-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]

diff --git a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
index eed5e9a77ae75e7c0adf5ac575a5441f7b00ca46..0d4eb904639a0bfb144fb2be64a538f2d6eabcbd 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
@@ -25,12 +25,6 @@ tasks:
     conf:
       osd:
         osd min pg log entries: 5
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-1
-      osd.1:
-        crimson cpu set: 2-3
-      osd.2:
-        crimson cpu set: 4-5
+        crimson cpu num: 2
       global:
 - osd_backfill:

diff --git a/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml b/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
index 6624e6b2dcc83f2b4efe623b5a13e651311fae7a..158681b4197c311322540c6968b093bba5e8c68b 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
@@ -23,13 +23,7 @@ tasks:
     conf:
       osd:
         osd min pg log entries: 5
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-1
-      osd.1:
-        crimson cpu set: 2-3
-      osd.2:
-        crimson cpu set: 4-5
+        crimson cpu num: 2
       global:
 - workunit:
     clients:

diff --git a/qa/suites/crimson-rados/thrash/clusters/crimson-fixed-2.yaml b/qa/suites/crimson-rados/thrash/clusters/crimson-fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..412e394
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/clusters/crimson-fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
deleted file mode 100644 (file)
index c8dc2a2..0000000
--- a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-2
-      osd.1:
-        crimson cpu set: 3-5
-      osd.2:
-        crimson cpu set: 0-2
-      osd.3:
-        crimson cpu set: 3-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc

diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/crimson-fixed-2.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/crimson-fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..412e394
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/crimson-fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml
deleted file mode 100644 (file)
index c8dc2a2..0000000
--- a/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-2
-      osd.1:
-        crimson cpu set: 3-5
-      osd.2:
-        crimson cpu set: 0-2
-      osd.3:
-        crimson cpu set: 3-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc

diff --git a/qa/suites/crimson-rados/thrash_simple/clusters/crimson-fixed-2.yaml b/qa/suites/crimson-rados/thrash_simple/clusters/crimson-fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..412e394
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash_simple/clusters/crimson-fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/crimson/crimson-fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
deleted file mode 100644 (file)
index c8dc2a2..0000000
--- a/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-        crimson bluestore cpu set: 6-7
-      osd.0:
-        crimson cpu set: 0-2
-      osd.1:
-        crimson cpu set: 3-5
-      osd.2:
-        crimson cpu set: 0-2
-      osd.3:
-        crimson cpu set: 3-5
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc