qa/suites/rados/multimon: skew clocks 2s (< paxos lease)

If the leader is the one with the accurate clock, it can still
form quorum, but if the leader has the skewed clock, all other mons appear
skewed from its perspective and no quorum is formed.  This leads to
intermittent failures, depending on the non-deterministic teuthology
deployment order and how the mon IPs sort.

Fix by reducing the skew.  This is enough skew to trigger a warning, but
not enough that it will break quorum.  This ensures that the parts of the
teuthology test that issue random mon commands won't fail (e.g., 'ceph osd
dump').

Fixes: http://tracker.ceph.com/issues/40112
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fd00136eb3b181ca34937fc7ea99427338ae6069)

diff --git a/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml b/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
index 7567cd6a93ad6b8afa77c64f08f0649dfde2f6a6..b834f9deff3570b00790eab6e271241dade71ddf 100644 (file)
--- a/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
+++ b/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
@@ -2,7 +2,7 @@ tasks:
 - install:
 - exec:
     mon.b:
-    - date -u -s @$(expr $(date -u +%s) + 10)
+    - date -u -s @$(expr $(date -u +%s) + 2)
 - ceph:
     wait-for-healthy: false
     log-whitelist: