From 7bce656b409f6bc0e18fe963cfeb9c2134b095be Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Thu, 9 Apr 2015 12:18:21 +0200 Subject: [PATCH] make sure sync cannot block reboot The recent discussed improvement has the risk that if 'sync' hangs, the reboot may be delayed in the same way as the 'reboot' command would do. To work around, we're adding a 5 second timeout. If it cannot sync in 5 seconds, it will not succeed anyway and we should proceed the reset. @snuf: Could we use your OVM3 heartbeat script for other hypervisors as well? One way to do it seems like a nice idea :-) --- scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh index ff6fd0ab6a0..7c8ee67f30c 100755 --- a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh +++ b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh @@ -156,7 +156,8 @@ then elif [ "$cflag" == "1" ] then /usr/bin/logger -t heartbeat "kvmheartbeat.sh rebooted system because it was unable to write the heartbeat to the storage." - sync + sync & + sleep 5 echo b > /proc/sysrq-trigger exit $? else