gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-30 00:52:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Discard rrouter lock

Browse Source 
Then we can make all the actions in sequence
This commit is contained in:
Sheng Yang 2011-12-28 17:44:50 -08:00
parent 217aceb9ef
commit 7e6bbf9b16
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/systemvm/debian/config/root/edithosts.sh
View File

@ -48,13 +48,6 @@ then
exit 1
fi
lock_rr="rrouter"
locked_rr=$(getLockFile $lock_rr)
if [ "$locked_rr" != "1" ]
then
exit 1
fi
grep "redundant_router=1" /var/cache/cloud/cmdline > /dev/null
no_redundant=$?
@ -136,5 +129,4 @@ else
fi
ret=$?
releaseLockFile $lock_rr $locked_rr
unlock_exit $ret $lock $locked

3
patches/systemvm/debian/config/root/func.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
# IMPORTANT: Ordering of lock:
# biglock --> rrouter
# Only one lock is allowed: biglock
# getLockFile() parameters
# $1 lock filename

2
patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
View File

@ -2,7 +2,7 @@
source /root/func.sh
lock="rrouter"
lock="biglock"
locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then

2
patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
View File

@ -2,7 +2,7 @@
source /root/func.sh
lock="rrouter"
lock="biglock"
locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then

2
patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
View File

@ -2,7 +2,7 @@
source /root/func.sh
lock="rrouter"
lock="biglock"
locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then

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

@ -2,7 +2,7 @@
source /root/func.sh
lock="rrouter"
lock="biglock"
locked=$(getLockFile $lock)
if [ "$locked" != "1" ]
then