rhtyd closed pull request #2984: kvm: reset KVM host on heartbeat failure
URL: https://github.com/apache/cloudstack/pull/2984
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
index f180848a8d5..9aa55f89dc8 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
@@ -35,7 +35,7 @@
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
diff --git a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
index 30ca72a2aa9..df2e54db85a 100755
--- a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
+++ b/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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
