qa: Restrict rados api tests to large clusters and increase timeout

Running these tests with thrashers on small clusters leads to many very
slow ops due to the cluster being overloaded. That has a tendency to
make some of the API tests timeout and fail.

Fixes: https://tracker.ceph.com/issues/50371
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/qa/clusters/2-node-mgr.yaml b/qa/clusters/2-node-mgr.yaml
index b1c29a866385e2a84f3fb72faa571c6a8a156652..be657492c1ec892650f47147fb359e5e703f8a2b 100644 (file)
--- a/qa/clusters/2-node-mgr.yaml
+++ b/qa/clusters/2-node-mgr.yaml
@@ -1,3 +1,4 @@
+clusternodes: 2
 roles:
 - [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0]
 - [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1]

diff --git a/qa/clusters/extra-client.yaml b/qa/clusters/extra-client.yaml
index 33fa505b714082a5a6c68f431bf6bbd5ebf019d8..4bf258bcd41907781ca2f894567248874370cbd0 100644 (file)
--- a/qa/clusters/extra-client.yaml
+++ b/qa/clusters/extra-client.yaml
@@ -1,3 +1,4 @@
+clusternodes: 2
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
 - [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
@@ -11,4 +12,4 @@ overrides:
   ceph:
     conf:
       osd:
-        osd shutdown pgref assert: true
\ No newline at end of file
+        osd shutdown pgref assert: true

diff --git a/qa/clusters/fixed-1.yaml b/qa/clusters/fixed-1.yaml
index d8e5898b99f4afacb3625d573a64f9a285e8ec66..a7cf5db3d69d24fc8afa930101cb3c370a3097e1 100644 (file)
--- a/qa/clusters/fixed-1.yaml
+++ b/qa/clusters/fixed-1.yaml
@@ -1,3 +1,4 @@
+clusternodes: 1
 overrides:
   ceph-deploy:
     conf:

diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml
index e4448bb2008834ec3e0480e0a9d83070be48b818..964d6a49b2bf8c85613e06cf503f2ef5dddc84cf 100644 (file)
--- a/qa/clusters/fixed-2.yaml
+++ b/qa/clusters/fixed-2.yaml
@@ -1,3 +1,4 @@
+clusternodes: 2
 roles:
 - [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0, node-exporter.a]
 - [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1, prometheus.a, node-exporter.b]

diff --git a/qa/clusters/fixed-3-cephfs.yaml b/qa/clusters/fixed-3-cephfs.yaml
index 9e021b3bd69bc67158b3129737f9769ba04d1a5b..493b044eb998a6b6b95eb02ca473d264bb33d8cd 100644 (file)
--- a/qa/clusters/fixed-3-cephfs.yaml
+++ b/qa/clusters/fixed-3-cephfs.yaml
@@ -1,3 +1,4 @@
+clusternodes: 2
 roles:
 - [mon.a, mds.a, mgr.x, osd.0, osd.1]
 - [mon.b, mds.b, mon.c, mgr.y, osd.2, osd.3]

diff --git a/qa/clusters/fixed-3.yaml b/qa/clusters/fixed-3.yaml
index ddc79a84b60c64ec7bcfd8227fd6953d571e04e2..e87ae93923750a230abc2a4bd07725982db18b48 100644 (file)
--- a/qa/clusters/fixed-3.yaml
+++ b/qa/clusters/fixed-3.yaml
@@ -1,3 +1,4 @@
+clusternodes: 2
 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]

diff --git a/qa/clusters/fixed-4.yaml b/qa/clusters/fixed-4.yaml
index b73163751ab62d4af341b6a697608c7f8616617f..eef1d54fdd3fe3323a8285023dbb227f15c667b2 100644 (file)
--- a/qa/clusters/fixed-4.yaml
+++ b/qa/clusters/fixed-4.yaml
@@ -1,3 +1,4 @@
+clusternodes: 4
 roles: 
 - [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
 - [mon.b, osd.1, osd.5, osd.9, osd.13] 
@@ -11,4 +12,4 @@ overrides:
   ceph:
     conf:
       osd:
-        osd shutdown pgref assert: true
\ No newline at end of file
+        osd shutdown pgref assert: true

diff --git a/qa/suites/rados/thrash/workloads/rados_api_tests.yaml b/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
index 3e72897ae0520afb3c1495c3701c0574e89e7c62..97520e6a8cc879b6e0b6860078eea7e7aa7cb5a0 100644 (file)
--- a/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
+++ b/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
@@ -1,3 +1,7 @@
+teuthology:
+  postmerge:
+    # Don't run this test on tiny clusters
+    - if yaml.clusternodes < 4 then reject() end
 overrides:
   ceph:
     log-ignorelist:
@@ -16,6 +20,7 @@ overrides:
       osd:
         osd class load list: "*"
         osd class default list: "*"
+        osd client watch timeout: 240
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rados/verify/tasks/rados_api_tests.yaml b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
index e5a54e69e011e2e0649f446295ba04da8302ce14..d23eda8cf10b4c23879e948e72ec3fd47b99dda8 100644 (file)
--- a/qa/suites/rados/verify/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -1,3 +1,7 @@
+teuthology:
+  postmerge:
+    # Don't run this test on tiny clusters
+    - if yaml.clusternodes < 4 then reject() end
 overrides:
   ceph:
     log-ignorelist:
@@ -23,7 +27,7 @@ overrides:
       osd:
         osd class load list: "*"
         osd class default list: "*"
-        osd client watch timeout: 120
+        osd client watch timeout: 240
 tasks:
 - workunit:
     timeout: 6h