From dfb77d548ff0e8048fd6c8d885ad4d43029046ca Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Oct 2016 11:54:36 -0400 Subject: [PATCH] upgrade/jewel-x: drop 'failed to encode' crc mismatch whitelist We should no longer trigger these warnings now that we build the OSDMap based on require_*_osds flags. Signed-off-by: Sage Weil --- suites/upgrade/jewel-x/parallel/0-cluster/start.yaml | 1 - .../upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml | 1 - .../stress-split-erasure-code-x86_64/3-thrash/default.yaml | 1 - .../jewel-x/stress-split-erasure-code/3-thrash/default.yaml | 1 - suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml | 1 - 5 files changed, 5 deletions(-) diff --git a/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml b/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml index 1925f6be77f..4e24f4f57a3 100644 --- a/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml @@ -22,7 +22,6 @@ overrides: log-whitelist: - scrub mismatch - ScrubResult - - failed to encode map - wrongly marked conf: fs: xfs diff --git a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml index 642aa43661c..61c87631826 100644 --- a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml +++ b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml @@ -15,7 +15,6 @@ overrides: - reached quota - scrub - osd_map_max_advance - - failed to encode - wrongly marked fs: xfs conf: diff --git a/suites/upgrade/jewel-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml b/suites/upgrade/jewel-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml index 389a1909ec2..8bf7ad4aab3 100644 --- a/suites/upgrade/jewel-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml +++ b/suites/upgrade/jewel-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml @@ -8,7 +8,6 @@ overrides: - wrongly marked me down - objects unfound and apparently lost - log bound mismatch - - failed to encode map e tasks: - thrashosds: timeout: 1200 diff --git a/suites/upgrade/jewel-x/stress-split-erasure-code/3-thrash/default.yaml b/suites/upgrade/jewel-x/stress-split-erasure-code/3-thrash/default.yaml index 8a87f75881d..de3a0bc7d84 100644 --- a/suites/upgrade/jewel-x/stress-split-erasure-code/3-thrash/default.yaml +++ b/suites/upgrade/jewel-x/stress-split-erasure-code/3-thrash/default.yaml @@ -8,7 +8,6 @@ overrides: - wrongly marked me down - objects unfound and apparently lost - log bound mismatch - - failed to encode map e tasks: - thrashosds: timeout: 1200 diff --git a/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml b/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml index f22d24bf785..a600a166a86 100644 --- a/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml +++ b/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml @@ -8,7 +8,6 @@ overrides: - wrongly marked me down - objects unfound and apparently lost - log bound mismatch - - failed to encode map e tasks: - thrashosds: timeout: 1200