From: Joao Eduardo Luis Date: Thu, 18 Jul 2013 16:31:27 +0000 (+0100) Subject: task: mon_clock_skew_check: by default, use max skew from global config X-Git-Tag: 1.1.0~2064 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06ad2d2cc9e5a581b3f435f5d642bc21db364dd3;p=teuthology.git task: mon_clock_skew_check: by default, use max skew from global config If not defined, defaults to 0.05; if 'max-skew' however is defined, it must override whatever is on the config. Signed-off-by: Joao Eduardo Luis --- diff --git a/teuthology/task/mon_clock_skew_check.py b/teuthology/task/mon_clock_skew_check.py index 1fb9cecac..1ad400cad 100644 --- a/teuthology/task/mon_clock_skew_check.py +++ b/teuthology/task/mon_clock_skew_check.py @@ -60,7 +60,14 @@ class ClockSkewCheck: self.config = dict() self.check_interval = float(self.config.get('interval', 30.0)) - self.max_skew = float(self.config.get('max-skew', 0.05)) + + # 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) + ) + ) + self.expect_skew = self.config.get('expect-skew', False) self.never_fail = self.config.get('never-fail', False) self.at_least_once = self.config.get('at-least-once', True)