upgrade/dumpling-x: whitelist mon scrub mismatch

A mixed dumpling/firefly cluster will have each mon independently encode
the full map.  Firefly now puts feature bits in the Incremental so that
we encode the "right" way, but dumpling doesn't have that capability
yet, and we don't plan to backport it.

Fixes: #7704
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml
index 71c52461a34a3809917d44fc0d4b740d3e941c23..507fe3d31134edbb2f4578c90c691d31d58640b4 100644 (file)
--- a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml
@@ -14,3 +14,5 @@ overrides:
     conf:
       mon:
         mon warn on legacy crush tunables: false
+    log-whitelist:
+    - scrub mismatch