Merge PR ceph#38889 into master

* refs/pull/38889/head: qa: add delays only for osd/mds Reviewed-by: Jeff Layton <[email protected]>
amincheloh · Jan 14, 2021 · bc57344 · bc57344
2 parents 855c134 + ef19481
commit bc57344
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/qa/suites/fs/thrash/multifs/msgr-failures/osd-mds-delay.yaml b/qa/suites/fs/thrash/multifs/msgr-failures/osd-mds-delay.yaml
@@ -1,9 +1,15 @@
 overrides:
   ceph:
     conf:
-      global:
+      osd:
         ms inject socket failures: 2500
-        ms inject delay type: osd mds
+        ms inject delay type: client mds
+        ms inject delay probability: .005
+        ms inject delay max: 1
+        mon client directed command retry: 5
+      mds:
+        ms inject socket failures: 2500
+        ms inject delay type: client mds osd
         ms inject delay probability: .005
         ms inject delay max: 1
         mon client directed command retry: 5

diff --git a/qa/suites/fs/thrash/workloads/msgr-failures/osd-mds-delay.yaml b/qa/suites/fs/thrash/workloads/msgr-failures/osd-mds-delay.yaml
@@ -1,9 +1,15 @@
 overrides:
   ceph:
     conf:
-      global:
+      osd:
         ms inject socket failures: 2500
-        ms inject delay type: osd mds
+        ms inject delay type: client mds
+        ms inject delay probability: .005
+        ms inject delay max: 1
+        mon client directed command retry: 5
+      mds:
+        ms inject socket failures: 2500
+        ms inject delay type: client mds osd
         ms inject delay probability: .005
         ms inject delay max: 1
         mon client directed command retry: 5