From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 1 Dec 2016 15:36:42 +0000 (+0100)
Subject: kernel: fix reboot into the new kernel on xenial
X-Git-Tag: 1.1.0~491^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F992%2Fhead;p=teuthology.git

kernel: fix reboot into the new kernel on xenial

shutdown is a symlink to systemctl on xenial, and on "shutdown -r now"
network gets shut down before ssh has a chance to close gracefully.
There have been multiple complaints about this and some distantly
related fixes have made it into recent systemds [1].

This doesn't seem to happen on centos, probably because of different
systemd versions or sshd configuration, so this band-aid is for ubuntu
only.  "systemctl --no-block reboot" is nicer, but not available on
trusty.

[1] https://github.com/systemd/systemd/issues/2390

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 9bfc775f..f68c3dcb 100644
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -596,10 +596,18 @@ def install_and_reboot(ctx, config):
                 'rm',
                 remote_pkg_path(role_remote),
                 run.Raw('&&'),
+                # work around a systemd issue, where network gets shut down
+                # before ssh can close its session
+                run.Raw('('),
+                'sleep',
+                '1',
+                run.Raw('&&'),
                 'sudo',
                 'shutdown',
                 '-r',
                 'now',
+                run.Raw('&'),
+                run.Raw(')'),
                 ],
             wait=False,
             )