From: Sage Weil <sage@newdream.net>
Date: Mon, 23 Apr 2012 16:21:02 +0000 (-0700)
Subject: nuke: ignore ntpdate errors
X-Git-Tag: 1.1.0~2566
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a11b69fd4cf281d1b21bc82e0188e2a36754cf0a;p=teuthology.git

nuke: ignore ntpdate errors

We keep seeing a race between ntpd startup and our stop + ntpdate + start
sequence.  Ignore errors here.
---

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 43b40e46a6..8b01f29281 100644
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -218,6 +218,8 @@ def synch_clocks(remotes, log):
                 'sudo', 'hwclock', '--systohc', '--utc',
                 run.Raw('&&'),
                 'sudo', 'service', 'ntp', 'start',
+                run.Raw('||'),
+                'true',    # ignore errors; we may be racing with ntpd startup
                 ],
             wait=False,
             )