task: mon_clock_skew_check: grab max-skew value from ceph-mon's config

Instead of relying on hardcoded values, obtain the max-skew default from
'ceph-mon --show-config-value mon_clock_drift_allowed' to match the mon's
expectation.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/mon_clock_skew_check.py b/teuthology/task/mon_clock_skew_check.py
index 1ad400cad770dc213a4cb478a2bc8c0068112635..000f3bf89b6fd0ee9b0e98ccbfcdcb29c6bac23a 100644 (file)
--- a/teuthology/task/mon_clock_skew_check.py
+++ b/teuthology/task/mon_clock_skew_check.py
@@ -3,6 +3,7 @@ import contextlib
 import ceph_manager
 import time
 import gevent
+from StringIO import StringIO
 from teuthology import misc as teuthology
 
 log = logging.getLogger(__name__)
@@ -61,12 +62,17 @@ class ClockSkewCheck:
 
     self.check_interval = float(self.config.get('interval', 30.0))
 
-    # config defined max-skew must have priority over globally defined
-    self.max_skew = float(
-        self.config.get('max-skew',
-          ctx.ceph.conf['global'].get('mon clock drift allowed', 0.05)
-          )
+    first_mon = teuthology.get_first_mon(ctx, config)
+    remote = ctx.cluster.only(first_mon).remotes.keys()[0]
+    proc = remote.run(
+        args=[
+          'sudo',
+          'ceph-mon',
+          '-i', first_mon[4:],
+          '--show-config-value', 'mon_clock_drift_allowed'
+          ], stdout=StringIO(), wait=True
         )
+    self.max_skew = self.config.get('max-skew', float(proc.stdout.getvalue()))
 
     self.expect_skew = self.config.get('expect-skew', False)
     self.never_fail = self.config.get('never-fail', False)