Merge remote-tracking branch 'origin/4.11'

This commit is contained in:
Rohit Yadav 2018-10-30 15:15:35 +05:30
commit 7479e2877f
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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