upgrade/dumpling-emperor-x: ignore 'scrub mismatch' from mon

The encoded full osdmaps can differ due to a series of issues that were
fixed well after emperor.  We also whitelist this for dumpling-x.

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

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml
index 5b6d8978cdc4e57b9823e4654c27a0a137bbfaa0..f04bd04551da56d9f6cef89f15986d82b5a51cad 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml
@@ -1,3 +1,8 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - scrub mismatch
+      - ScrubResult
 roles:
 - - mon.a
   - mds.a