You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/04/10 21:57:48 UTC

[1/2] git commit: updated refs/heads/4.4 to 97623bb

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 a79fd8816 -> 97623bb0d


reboot much faster in case of storage failure

When storage cannot be reached, it does not make sense to reboot as it will try to flush buffers, umount NFS mounts, etc. This will not work and thus cause a long delay. With this change, the box will reboot immediately (like pressing the reset button).


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6137b268
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6137b268
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6137b268

Branch: refs/heads/4.4
Commit: 6137b2681cd8b923a9920be696f2e25a081997c4
Parents: a79fd88
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Apr 1 19:45:16 2015 +0200
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Fri Apr 10 14:50:15 2015 -0500

----------------------------------------------------------------------
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6137b268/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
index 7293b14..0c07ffa 100755
--- a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
+++ b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
@@ -155,7 +155,7 @@ then
   exit 0
 elif [ "$cflag" == "1" ]
 then
-  reboot
+  echo b > /proc/sysrq-trigger
   exit $?
 else
   write_hbLog 


[2/2] git commit: updated refs/heads/4.4 to 97623bb

Posted by da...@apache.org.
write logfile just before rebooting the host

As discussed with @wido @pyr and @nuxro added an extra log line.

Tested it and it logs fine (tested to local disk) when syncing first:
Apr  3 15:31:23 mcctest2 heartbeat: kvmheartbeat.sh system because it was unable to write the heartbeat to the storage

By the way, it did also log to the agent.log but this extra log has the benefit of ending up in the system log so you'll probably find it easier there. Existing logs:
2015-04-03 15:27:23,943 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 0
2015-04-03 15:28:23,944 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 1
2015-04-03 15:29:23,946 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 2
2015-04-03 15:30:23,948 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 3
2015-04-03 15:31:23,950 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 4
2015-04-03 15:31:23,950 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout; reboot the host

This closes #145

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97623bb0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97623bb0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97623bb0

Branch: refs/heads/4.4
Commit: 97623bb0df51dcd8b64dd1b963d25ce563f3a66e
Parents: 6137b26
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Apr 3 21:46:02 2015 +0200
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Fri Apr 10 14:50:58 2015 -0500

----------------------------------------------------------------------
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97623bb0/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
index 0c07ffa..ff6fd0a 100755
--- a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
+++ b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
@@ -155,6 +155,8 @@ then
   exit 0
 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
   echo b > /proc/sysrq-trigger
   exit $?
 else