From 720f4c78bd66214c9ee0a0672f1c041a86408afc Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 1 Apr 2015 15:53:36 -0700 Subject: [PATCH] Fixed #11306 Whitelist WRN "failed to encode map" Signed-off-by: Yuri Weinstein (cherry picked from commit 9b9d27b25ee3f75fedc5db788bbe87b93d517f0e) --- .../client-upgrade/dumpling-x/basic/0-cluster/start.yaml | 5 +++++ .../client-upgrade/firefly-x/basic/0-cluster/start.yaml | 4 ++++ .../dumpling-firefly-x/parallel/0-cluster/start.yaml | 1 + .../dumpling-firefly-x/stress-split/00-cluster/start.yaml | 2 ++ suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml | 1 + .../upgrade/dumpling-x/stress-split/0-cluster/start.yaml | 2 ++ suites/upgrade/firefly-x/parallel/0-cluster/start.yaml | 1 + suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml | 7 +++---- suites/upgrade/giant-x/parallel/0-cluster/start.yaml | 1 + suites/upgrade/giant-x/stress-split/0-cluster/start.yaml | 2 ++ 10 files changed, 22 insertions(+), 4 deletions(-) diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml index 01747e4205612..1f53351b20129 100644 --- a/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml +++ b/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml @@ -8,3 +8,8 @@ roles: - osd.2 - osd.3 - - client.0 +overrides: + ceph: + log-whitelist: + - failed to encode map + diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml index 01747e4205612..db6f5e2fe9904 100644 --- a/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml +++ b/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml @@ -8,3 +8,7 @@ roles: - osd.2 - osd.3 - - client.0 +overrides: + ceph: + log-whitelist: + - failed to encode map diff --git a/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml index e3d7f85f9ffad..460b39f804af3 100644 --- a/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml @@ -6,6 +6,7 @@ overrides: log-whitelist: - scrub mismatch - ScrubResult + - failed to encode map roles: - - mon.a - mds.a diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml index 504e20e246788..129635fa52a96 100644 --- a/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml +++ b/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml @@ -1,5 +1,7 @@ overrides: ceph: + log-whitelist: + - failed to encode map conf: mon: mon warn on legacy crush tunables: false diff --git a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml index 4a9420f390668..c39d9dfeca9fc 100644 --- a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml @@ -17,3 +17,4 @@ overrides: log-whitelist: - scrub mismatch - ScrubResult + - failed to encode map diff --git a/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml index 504e20e246788..a1b6b303f3302 100644 --- a/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml +++ b/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml @@ -3,6 +3,8 @@ overrides: conf: mon: mon warn on legacy crush tunables: false + log-whitelist: + - failed to encode map roles: - - mon.a - mon.b diff --git a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml index fcb90eed8425c..ecbdd8c3043d8 100644 --- a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml @@ -17,6 +17,7 @@ overrides: log-whitelist: - scrub mismatch - ScrubResult + - failed to encode map conf: mon: mon warn on legacy crush tunables: false diff --git a/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml b/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml index ad2a6f984a2c5..6bf44d8a1df75 100644 --- a/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml +++ b/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml @@ -1,5 +1,8 @@ overrides: ceph: + log-whitelist: + - Missing health data for MDS + - failed to encode map conf: mon: mon warn on legacy crush tunables: false @@ -23,7 +26,3 @@ roles: - osd.12 - osd.13 - - client.0 -overrides: - ceph: - log-whitelist: - - Missing health data for MDS diff --git a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml index fcb90eed8425c..ecbdd8c3043d8 100644 --- a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml @@ -17,6 +17,7 @@ overrides: log-whitelist: - scrub mismatch - ScrubResult + - failed to encode map conf: mon: mon warn on legacy crush tunables: false diff --git a/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml b/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml index 9ea0a27f82a2f..c27322a7e9475 100644 --- a/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml +++ b/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml @@ -1,5 +1,7 @@ overrides: ceph: + log-whitelist: + - failed to encode map conf: mon: mon warn on legacy crush tunables: false -- 2.39.5