test: Ignore OSD_SLOW_PING_TIME* if injecting socket failures

Fixes: https://tracker.ceph.com/issues/41743
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ded58ef91d6c8a68de49fa2c6b6e01636515c59b)

Conflicts: 3 yamls don't exist in Mimic

diff --git a/qa/suites/fs/thrash/msgr-failures/osd-mds-delay.yaml b/qa/suites/fs/thrash/msgr-failures/osd-mds-delay.yaml
index 4dc0086e6748c8aeb94957222d49db67fc56e2c3..68802961957f81f34e911ceb62fcdcd16f641af9 100644 (file)
--- a/qa/suites/fs/thrash/msgr-failures/osd-mds-delay.yaml
+++ b/qa/suites/fs/thrash/msgr-failures/osd-mds-delay.yaml
@@ -6,3 +6,5 @@ overrides:
         ms inject delay type: osd mds
         ms inject delay probability: .005
         ms inject delay max: 1
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/rbd-nomount/msgr-failures/few.yaml b/qa/suites/krbd/rbd-nomount/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/krbd/rbd-nomount/msgr-failures/few.yaml
+++ b/qa/suites/krbd/rbd-nomount/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/rbd-nomount/msgr-failures/many.yaml b/qa/suites/krbd/rbd-nomount/msgr-failures/many.yaml
index 86f8dde8a0e35f5d070c9ce894256fe2fad4edea..4caedaebdcaf1f1d8b5bf7001412d0568c9436a7 100644 (file)
--- a/qa/suites/krbd/rbd-nomount/msgr-failures/many.yaml
+++ b/qa/suites/krbd/rbd-nomount/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/rbd/msgr-failures/few.yaml b/qa/suites/krbd/rbd/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/krbd/rbd/msgr-failures/few.yaml
+++ b/qa/suites/krbd/rbd/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/rbd/msgr-failures/many.yaml b/qa/suites/krbd/rbd/msgr-failures/many.yaml
index 86f8dde8a0e35f5d070c9ce894256fe2fad4edea..4caedaebdcaf1f1d8b5bf7001412d0568c9436a7 100644 (file)
--- a/qa/suites/krbd/rbd/msgr-failures/many.yaml
+++ b/qa/suites/krbd/rbd/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/singleton/msgr-failures/few.yaml b/qa/suites/krbd/singleton/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/krbd/singleton/msgr-failures/few.yaml
+++ b/qa/suites/krbd/singleton/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/singleton/msgr-failures/many.yaml b/qa/suites/krbd/singleton/msgr-failures/many.yaml
index 86f8dde8a0e35f5d070c9ce894256fe2fad4edea..4caedaebdcaf1f1d8b5bf7001412d0568c9436a7 100644 (file)
--- a/qa/suites/krbd/singleton/msgr-failures/many.yaml
+++ b/qa/suites/krbd/singleton/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/krbd/wac/wac/verify/many-resets.yaml b/qa/suites/krbd/wac/wac/verify/many-resets.yaml
index 526897e9cda8cce3e74eb9b42f3ae77819037e52..d69f65031decb2b7e0fd90805d81dc01311671d6 100644 (file)
--- a/qa/suites/krbd/wac/wac/verify/many-resets.yaml
+++ b/qa/suites/krbd/wac/wac/verify/many-resets.yaml
@@ -3,6 +3,8 @@ overrides:
     conf:
       global:
         ms inject socket failures: 500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME
 tasks:
 - exec:
     client.0:

diff --git a/qa/suites/rados/basic/msgr-failures/few.yaml b/qa/suites/rados/basic/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/basic/msgr-failures/few.yaml
+++ b/qa/suites/rados/basic/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/basic/msgr-failures/many.yaml b/qa/suites/rados/basic/msgr-failures/many.yaml
index 038c3a799086a07c5a64882c30f1e8896f0056d1..f4bb065b5f3af0c4670f4ebb86af4992bf16c9e4 100644 (file)
--- a/qa/suites/rados/basic/msgr-failures/many.yaml
+++ b/qa/suites/rados/basic/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 1500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/monthrash/msgr-failures/few.yaml b/qa/suites/rados/monthrash/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/monthrash/msgr-failures/few.yaml
+++ b/qa/suites/rados/monthrash/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/monthrash/msgr-failures/mon-delay.yaml b/qa/suites/rados/monthrash/msgr-failures/mon-delay.yaml
index da25b7a09eb910b2af0d09247a56501f8c33ad1e..fcd8ca7c293110abc6a7e14afbee5fb792c64e9f 100644 (file)
--- a/qa/suites/rados/monthrash/msgr-failures/mon-delay.yaml
+++ b/qa/suites/rados/monthrash/msgr-failures/mon-delay.yaml
@@ -9,3 +9,5 @@ overrides:
         ms inject internal delays: .002
       mgr:
         debug monc: 10
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/multimon/msgr-failures/few.yaml b/qa/suites/rados/multimon/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/multimon/msgr-failures/few.yaml
+++ b/qa/suites/rados/multimon/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/multimon/msgr-failures/many.yaml b/qa/suites/rados/multimon/msgr-failures/many.yaml
index 54e6d7f2bfd04e2d6ee9766786fef57f0c320bc3..ffeb5f6857c82050ca777d705bfae0a5d7b299c3 100644 (file)
--- a/qa/suites/rados/multimon/msgr-failures/many.yaml
+++ b/qa/suites/rados/multimon/msgr-failures/many.yaml
@@ -4,3 +4,5 @@ overrides:
       global:
         ms inject socket failures: 1000
         mon mgr beacon grace: 90
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml b/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml
+++ b/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml b/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml
index 5f67fcea9a1cbc2475d9229677c73689a4920615..59ca5c0f0fa8120513d9e760f7dc86f243a7df09 100644 (file)
--- a/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml
+++ b/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 1000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/singleton/msgr-failures/few.yaml b/qa/suites/rados/singleton/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/singleton/msgr-failures/few.yaml
+++ b/qa/suites/rados/singleton/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/singleton/msgr-failures/many.yaml b/qa/suites/rados/singleton/msgr-failures/many.yaml
index cd193532d906de61d29d186b9cc1d364d10c6dd3..20aeb4df28b35a4174491249ae8ca878ab13c97d 100644 (file)
--- a/qa/suites/rados/singleton/msgr-failures/many.yaml
+++ b/qa/suites/rados/singleton/msgr-failures/many.yaml
@@ -7,3 +7,5 @@ overrides:
         mon client hunt interval max multiple: 2
       mgr:
         debug monc: 10
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash-old-clients/msgr-failures/fastclose.yaml b/qa/suites/rados/thrash-old-clients/msgr-failures/fastclose.yaml
index 77fd730aff70f61c2226702b9ddfe54c99bae8e6..02121726ef4d58d4ad7cab00e27422bdcb54e99f 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/msgr-failures/fastclose.yaml
+++ b/qa/suites/rados/thrash-old-clients/msgr-failures/fastclose.yaml
@@ -4,3 +4,5 @@ overrides:
       global:
         ms inject socket failures: 2500
         ms tcp read timeout: 5
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash-old-clients/msgr-failures/few.yaml b/qa/suites/rados/thrash-old-clients/msgr-failures/few.yaml
index 477bffe619bcf3388288b82308f2b67466506e80..527eadb450b68e834922129aea367a9e20417706 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/msgr-failures/few.yaml
+++ b/qa/suites/rados/thrash-old-clients/msgr-failures/few.yaml
@@ -5,3 +5,5 @@ overrides:
         ms inject socket failures: 5000
       osd:
         osd heartbeat use min delay socket: true
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash-old-clients/msgr-failures/osd-delay.yaml b/qa/suites/rados/thrash-old-clients/msgr-failures/osd-delay.yaml
index a33ba89e14fb82bfc5624df2b9b855828b92ece3..91c147256356d8dddd7d544065fcbcc39d661b81 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/msgr-failures/osd-delay.yaml
+++ b/qa/suites/rados/thrash-old-clients/msgr-failures/osd-delay.yaml
@@ -7,3 +7,5 @@ overrides:
         ms inject delay probability: .005
         ms inject delay max: 1
         ms inject internal delays: .002
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash/msgr-failures/fastclose.yaml b/qa/suites/rados/thrash/msgr-failures/fastclose.yaml
index 77fd730aff70f61c2226702b9ddfe54c99bae8e6..02121726ef4d58d4ad7cab00e27422bdcb54e99f 100644 (file)
--- a/qa/suites/rados/thrash/msgr-failures/fastclose.yaml
+++ b/qa/suites/rados/thrash/msgr-failures/fastclose.yaml
@@ -4,3 +4,5 @@ overrides:
       global:
         ms inject socket failures: 2500
         ms tcp read timeout: 5
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash/msgr-failures/few.yaml b/qa/suites/rados/thrash/msgr-failures/few.yaml
index 477bffe619bcf3388288b82308f2b67466506e80..527eadb450b68e834922129aea367a9e20417706 100644 (file)
--- a/qa/suites/rados/thrash/msgr-failures/few.yaml
+++ b/qa/suites/rados/thrash/msgr-failures/few.yaml
@@ -5,3 +5,5 @@ overrides:
         ms inject socket failures: 5000
       osd:
         osd heartbeat use min delay socket: true
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/thrash/msgr-failures/osd-delay.yaml b/qa/suites/rados/thrash/msgr-failures/osd-delay.yaml
index a33ba89e14fb82bfc5624df2b9b855828b92ece3..91c147256356d8dddd7d544065fcbcc39d661b81 100644 (file)
--- a/qa/suites/rados/thrash/msgr-failures/osd-delay.yaml
+++ b/qa/suites/rados/thrash/msgr-failures/osd-delay.yaml
@@ -7,3 +7,5 @@ overrides:
         ms inject delay probability: .005
         ms inject delay max: 1
         ms inject internal delays: .002
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rados/verify/msgr-failures/few.yaml b/qa/suites/rados/verify/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rados/verify/msgr-failures/few.yaml
+++ b/qa/suites/rados/verify/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rbd/basic/msgr-failures/few.yaml b/qa/suites/rbd/basic/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rbd/basic/msgr-failures/few.yaml
+++ b/qa/suites/rbd/basic/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rbd/cli/msgr-failures/few.yaml b/qa/suites/rbd/cli/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rbd/cli/msgr-failures/few.yaml
+++ b/qa/suites/rbd/cli/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rbd/cli_v1/msgr-failures/few.yaml b/qa/suites/rbd/cli_v1/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rbd/cli_v1/msgr-failures/few.yaml
+++ b/qa/suites/rbd/cli_v1/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rbd/qemu/msgr-failures/few.yaml b/qa/suites/rbd/qemu/msgr-failures/few.yaml
index 55b6df536ec797008abf3a20d37197d2c9423ee5..9349b4f9a30cb47298c54203a65bd45be6430ba0 100644 (file)
--- a/qa/suites/rbd/qemu/msgr-failures/few.yaml
+++ b/qa/suites/rbd/qemu/msgr-failures/few.yaml
@@ -5,3 +5,4 @@ overrides:
         ms inject socket failures: 5000
     log-whitelist:
     - but it is still running
+    - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rbd/thrash/msgr-failures/few.yaml b/qa/suites/rbd/thrash/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rbd/thrash/msgr-failures/few.yaml
+++ b/qa/suites/rbd/thrash/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/rgw/verify/msgr-failures/few.yaml b/qa/suites/rgw/verify/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/rgw/verify/msgr-failures/few.yaml
+++ b/qa/suites/rgw/verify/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/smoke/basic/tasks/mon_thrash.yaml b/qa/suites/smoke/basic/tasks/mon_thrash.yaml
index 595ef667d645d63d6a094fb34238eb6e55a1fc2d..2144afd2fe49983797a4247fa2b7e3a5c5f157c3 100644 (file)
--- a/qa/suites/smoke/basic/tasks/mon_thrash.yaml
+++ b/qa/suites/smoke/basic/tasks/mon_thrash.yaml
@@ -13,6 +13,7 @@ overrides:
       - \(OBJECT_
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
+      - \(OSD_SLOW_PING_TIME
     conf:
       global:
         ms inject delay max: 1

diff --git a/qa/suites/smoke/basic/tasks/rados_bench.yaml b/qa/suites/smoke/basic/tasks/rados_bench.yaml
index 0c77640f9b3212761d0e894e43e1b9e91f54c428..a9b6c6072f766c809b5f231ed1816b6f583819e6 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_bench.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_bench.yaml
@@ -22,6 +22,7 @@ tasks:
       - \(OBJECT_
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
+      - \(OSD_SLOW_PING_TIME
 - thrashosds:
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1

diff --git a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml b/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
index 8440c80c0a698c3684df6686ccfd1e90968058f2..3297ef5b8aafdf049d4cb9af9e9610ff5322ebc8 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
+++ b/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
@@ -11,6 +11,7 @@ overrides:
       - \(OBJECT_
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
+      - \(OSD_SLOW_PING_TIME
     conf:
       client:
         rbd cache: true

diff --git a/qa/suites/tgt/basic/msgr-failures/few.yaml b/qa/suites/tgt/basic/msgr-failures/few.yaml
index 0de320d46b8e20335a9e59a4bc115d4e82116ffb..4326fe23eb9ab25f76fecd92531e8161452feedd 100644 (file)
--- a/qa/suites/tgt/basic/msgr-failures/few.yaml
+++ b/qa/suites/tgt/basic/msgr-failures/few.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 5000
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME

diff --git a/qa/suites/tgt/basic/msgr-failures/many.yaml b/qa/suites/tgt/basic/msgr-failures/many.yaml
index 86f8dde8a0e35f5d070c9ce894256fe2fad4edea..4caedaebdcaf1f1d8b5bf7001412d0568c9436a7 100644 (file)
--- a/qa/suites/tgt/basic/msgr-failures/many.yaml
+++ b/qa/suites/tgt/basic/msgr-failures/many.yaml
@@ -3,3 +3,5 @@ overrides:
     conf:
       global:
         ms inject socket failures: 500
+    log-whitelist:
+      - \(OSD_SLOW_PING_TIME