]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
nuke: ignore ntpdate errors
authorSage Weil <sage@newdream.net>
Mon, 23 Apr 2012 16:21:02 +0000 (09:21 -0700)
committerSage Weil <sage@newdream.net>
Mon, 23 Apr 2012 16:21:02 +0000 (09:21 -0700)
We keep seeing a race between ntpd startup and our stop + ntpdate + start
sequence.  Ignore errors here.

teuthology/nuke.py

index 43b40e46a62f86fcd38df2d7fbc4eee6305aee3b..8b01f29281879004b540aff99ade99def1edacc5 100644 (file)
@@ -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,
             )