Merge remote-tracking branch 'origin/4.11'

Author: yadvr

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java

@@ -35,7 +35,7 @@ public class KVMHABase {
     protected long _heartBeatUpdateTimeout = 60000;
     protected long _heartBeatUpdateFreq = 60000;
     protected long _heartBeatUpdateMaxTries = 5;
-    protected long _heartBeatUpdateRetrySleep = 15000;
+    protected long _heartBeatUpdateRetrySleep = 10000;
 
     public static enum PoolType {
         PrimaryStorage, SecondaryStorage

scripts/vm/hypervisor/kvm/kvmheartbeat.sh

@@ -155,10 +155,10 @@ then
   exit 0
 elif [ "$cflag" == "1" ]
 then
-  /usr/bin/logger -t heartbeat "kvmheartbeat.sh stopped cloudstack-agent because it was unable to write the heartbeat to the storage."
+  /usr/bin/logger -t heartbeat "kvmheartbeat.sh will reboot system because it was unable to write the heartbeat to the storage."
   sync &
   sleep 5
-  service cloudstack-agent stop
+  echo b > /proc/sysrq-trigger
   exit $?
 else
   write_hbLog