Skip to content

Commit

Permalink
Don't use port open check to determine if reboot completed. Fixes #856.
Browse files Browse the repository at this point in the history
The old approach, waiting for the machine to not having an open
port, and then waiting for it to be open again, was insufficient,
because of the race condition that the machine rebooted so quickly
that the port was immediately open again without nixops noticing
that it went down. I experienced this on a Hetzner cloud server.

The new approach checks the `last reboot` on the remote side
to change, which is not racy.
  • Loading branch information
nh2 committed Jan 27, 2018
1 parent d4b2fc5 commit a3f6b8a
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions nixops/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def backup(self, defn, backup_id):
"""Make backup of persistent disks, if possible."""
self.warn("don't know how to make backup of disks for machine ‘{0}’".format(self.name))

def reboot(self, hard=False):
def reboot(self, hard=False, reset=True):
"""Reboot this machine."""
self.log("rebooting...")
if self.state == self.RESCUE:
Expand All @@ -182,16 +182,33 @@ def reboot(self, hard=False):
reboot_command = "systemctl reboot"
self.run_command(reboot_command, check=False)
self.state = self.STARTING
self.ssh.reset()
if reset:
self.ssh.reset()

def reboot_sync(self, hard=False):
"""Reboot this machine and wait until it's up again."""
self.reboot(hard=hard)
self.log_start("waiting for the machine to finish rebooting...")
nixops.util.wait_for_tcp_port(self.get_ssh_name(), self.ssh_port, open=False, callback=lambda: self.log_continue("."))
self.log_continue("[down]")
nixops.util.wait_for_tcp_port(self.get_ssh_name(), self.ssh_port, callback=lambda: self.log_continue("."))
self.log_end("[up]")

# To check when the machine has finished rebooting in a race-free
# manner, we compare the output of `last reboot` before and after
# the reboot. Once the output has changed, the reboot is done.
def get_last_reboot_output():
return self.run_command('last reboot --time-format iso | head -n1', capture_stdout=True).rstrip()

pre_reboot_last_reboot_output = get_last_reboot_output()

# We set reset=False so that we can continue running `last reboot`
# remotely; when the reboot happens, our SSH connection will be reset
# by the remote side instead.
self.reboot(hard=hard, reset=False)

self.log_start("waiting for reboot to complete...")
while True:
last_reboot_output = get_last_reboot_output()
if last_reboot_output != pre_reboot_last_reboot_output:
break
self.log_continue(".")
self.log_end("done.")

self.state = self.UP
self.ssh_pinged = True
self._ssh_pinged_this_time = True
Expand Down

0 comments on commit a3f6b8a

Please sign in to comment.