nuke: fix sync before reboot timeout

If you do 'timeout 5 sync' and sync hangs, timeout will block trying to
kill it.

Instead, just background sync, wait a few seconds, and reboot.  This means
we wait a few seconds even if sync returns immediately, but who cares!

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 8ec0c931ddf1b4647f43965bcaf3656b678f1ffd..11089d6a4be5453416603218795f05fe90865489 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -150,7 +150,9 @@ def reboot(ctx, remotes):
         log.info('rebooting %s', remote.name)
         proc = remote.run(  # note use of -n to force a no-sync reboot
             args=[
-                'timeout', '5', 'sync',
+                'sync',
+                run.Raw('&'),
+                'sleep', '5',
                 run.Raw(';'),
                 'sudo', 'reboot', '-f', '-n'
             ],