etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change router to FAULT state if anything goes wrong on fail-over

This commit is contained in:
Sheng Yang 2011-08-08 16:09:34 -07:00
parent ea07dff22e
commit 071a67dcb8
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/systemvm/debian/config/root/redundant_router/master.sh
View File

@ -24,9 +24,26 @@ fi
echo To master called >> /root/keepalived.log
/root/redundant_router/enable_pubip.sh >> /root/keepalived.log 2>&1
echo Enable public ip $? >> /root/keepalived.log
ret=$?
last_msg=`tail -n 1 /root/keepalived.log`
echo Enable public ip returned $ret >> /root/keepalived.log
if [ $ret -ne 0 ]
then
echo Fail to enable public ip! >> /root/keepalived.log
ifconfig eth2 down
service keepalived stop >> /root/keepalived.log 2>&1
service conntrackd stop >> /root/keepalived.log 2>&1
echo Status: FAULT \($last_msg\) >> /root/keepalived.log
rm $LOCK
exit
fi
/root/redundant_router/primary-backup.sh primary >> /root/keepalived.log 2>&1
echo Switch conntrackd mode primary $? >> /root/keepalived.log
ret=$?
echo Switch conntrackd mode primary returned $ret >> /root/keepalived.log
if [ $ret -ne 0 ]
then
echo Fail to switch conntrackd mode, but try to continue working >> /root/keepalived.log
fi
echo Status: MASTER >> /root/keepalived.log
rm $LOCK

2
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -776,7 +776,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
state = RedundantState.MASTER;
} else {
if (answer.getDetails() != null) {
if (answer.getDetails().equals("Status: BACKUP")) {
if (answer.getDetails().startsWith("Status: BACKUP")) {
state = RedundantState.BACKUP;
} else if (answer.getDetails().startsWith("Status: FAULT")) {
state = RedundantState.FAULT;