From e49f071a665c498e0b82962c7d237b19204c281c Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 3 Oct 2019 09:09:10 -0700 Subject: [PATCH] test: Ignore OSD_SLOW_PING_TIME* if injecting socket failures Fixes: https://tracker.ceph.com/issues/41743 Signed-off-by: David Zafman (cherry picked from commit ded58ef91d6c8a68de49fa2c6b6e01636515c59b) Conflicts: 3 yamls don't exist in Mimic --- qa/suites/fs/thrash/msgr-failures/osd-mds-delay.yaml | 2 ++ qa/suites/krbd/rbd-nomount/msgr-failures/few.yaml | 2 ++ qa/suites/krbd/rbd-nomount/msgr-failures/many.yaml | 2 ++ qa/suites/krbd/rbd/msgr-failures/few.yaml | 2 ++ qa/suites/krbd/rbd/msgr-failures/many.yaml | 2 ++ qa/suites/krbd/singleton/msgr-failures/few.yaml | 2 ++ qa/suites/krbd/singleton/msgr-failures/many.yaml | 2 ++ qa/suites/krbd/wac/wac/verify/many-resets.yaml | 2 ++ qa/suites/rados/basic/msgr-failures/few.yaml | 2 ++ qa/suites/rados/basic/msgr-failures/many.yaml | 2 ++ qa/suites/rados/monthrash/msgr-failures/few.yaml | 2 ++ qa/suites/rados/monthrash/msgr-failures/mon-delay.yaml | 2 ++ qa/suites/rados/multimon/msgr-failures/few.yaml | 2 ++ qa/suites/rados/multimon/msgr-failures/many.yaml | 2 ++ qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml | 2 ++ qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml | 2 ++ qa/suites/rados/singleton/msgr-failures/few.yaml | 2 ++ qa/suites/rados/singleton/msgr-failures/many.yaml | 2 ++ qa/suites/rados/thrash-old-clients/msgr-failures/fastclose.yaml | 2 ++ qa/suites/rados/thrash-old-clients/msgr-failures/few.yaml | 2 ++ qa/suites/rados/thrash-old-clients/msgr-failures/osd-delay.yaml | 2 ++ qa/suites/rados/thrash/msgr-failures/fastclose.yaml | 2 ++ qa/suites/rados/thrash/msgr-failures/few.yaml | 2 ++ qa/suites/rados/thrash/msgr-failures/osd-delay.yaml | 2 ++ qa/suites/rados/verify/msgr-failures/few.yaml | 2 ++ qa/suites/rbd/basic/msgr-failures/few.yaml | 2 ++ qa/suites/rbd/cli/msgr-failures/few.yaml | 2 ++ qa/suites/rbd/cli_v1/msgr-failures/few.yaml | 2 ++ qa/suites/rbd/qemu/msgr-failures/few.yaml | 1 + qa/suites/rbd/thrash/msgr-failures/few.yaml | 2 ++ qa/suites/rgw/verify/msgr-failures/few.yaml | 2 ++ qa/suites/smoke/basic/tasks/mon_thrash.yaml | 1 + qa/suites/smoke/basic/tasks/rados_bench.yaml | 1 + qa/suites/smoke/basic/tasks/rbd_fsx.yaml | 1 + qa/suites/tgt/basic/msgr-failures/few.yaml | 2 ++ qa/suites/tgt/basic/msgr-failures/many.yaml | 2 ++ 36 files changed, 68 insertions(+) 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 4dc0086e6748c..68802961957f8 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 86f8dde8a0e35..4caedaebdcaf1 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 86f8dde8a0e35..4caedaebdcaf1 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 86f8dde8a0e35..4caedaebdcaf1 100644 --- 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 526897e9cda8c..d69f65031decb 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 038c3a799086a..f4bb065b5f3af 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 da25b7a09eb91..fcd8ca7c29311 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 54e6d7f2bfd04..ffeb5f6857c82 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 5f67fcea9a1cb..59ca5c0f0fa81 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 cd193532d906d..20aeb4df28b35 100644 --- 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 77fd730aff70f..02121726ef4d5 100644 --- 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 477bffe619bcf..527eadb450b68 100644 --- 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 a33ba89e14fb8..91c147256356d 100644 --- 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 77fd730aff70f..02121726ef4d5 100644 --- 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 477bffe619bcf..527eadb450b68 100644 --- 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 a33ba89e14fb8..91c147256356d 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 55b6df536ec79..9349b4f9a30cb 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 595ef667d645d..2144afd2fe499 100644 --- 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 0c77640f9b321..a9b6c6072f766 100644 --- 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 8440c80c0a698..3297ef5b8aafd 100644 --- 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 0de320d46b8e2..4326fe23eb9ab 100644 --- 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 86f8dde8a0e35..4caedaebdcaf1 100644 --- 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 -- 2.39.5