task/restart: Handle error from script correctly

The exitstatus on the process is a gevent.AsyncResult
(not an int).  Use the try/except pattern for handling
errors instead.

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/teuthology/task/restart.py b/teuthology/task/restart.py
index 6799c4e96b9da903a8515f161acca96abad2cd7c..baacb223eb9223b1fc0c2311ffcc679571d7d0c2 100644 (file)
--- a/teuthology/task/restart.py
+++ b/teuthology/task/restart.py
@@ -143,10 +143,10 @@ def task(ctx, config):
                     restart_daemon(ctx, config, cmd[1], cmd[2], *cmd[3:])
                     proc.stdin.writelines(['restarted\n'])
                     proc.stdin.flush()
-                tor.wait([proc])
-                e = proc.exitstatus
-                if e != 0:
-                    raise Exception('restart task got non-zero exit status {d} from script: {s}'.format(d=e, s=c))
+                try:
+                    proc.exitstatus.get()
+                except tor.CommandFailedError:
+                    raise Exception('restart task got non-zero exit status from script: {s}'.format(s=c))
     finally:
         log.info('Finishing %s on %s...', task, role)
         remote.run(