qa: add delays only for osd/mds

The delays were applied everywhere and needlessly interfere with test
commands sent to mons from the ceph admin command. Furthermore, the
delays would not affect the kernel client. Now the delays are performed
by the MDS on clients.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

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
index b4ca87f51271bb75f683e8850beef23ced0e380d..17cbc5b9005aef93ef4007dd8813a3a532a65491 100644 (file)
--- 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
index b4ca87f51271bb75f683e8850beef23ced0e380d..17cbc5b9005aef93ef4007dd8813a3a532a65491 100644 (file)
--- 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