Updated Branches: refs/heads/master 2d30f42d0 -> cdbcc6663
CLOUDSTACK-3434: Improve the atomic of file lock used in VR Now we would retry if "ls" failed, since the list of files changed. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9549a7f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9549a7f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9549a7f Branch: refs/heads/master Commit: a9549a7f81703f3a7219c7ca81c8e8c2659951db Parents: 2d30f42 Author: Sheng Yang <[email protected]> Authored: Fri Jul 12 17:34:47 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Jul 15 16:08:27 2013 -0700 ---------------------------------------------------------------------- patches/systemvm/debian/config/root/func.sh | 41 ++++++++++++++++++------ 1 file changed, 32 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9549a7f/patches/systemvm/debian/config/root/func.sh ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/root/func.sh b/patches/systemvm/debian/config/root/func.sh index 9c7c494..1796345 100644 --- a/patches/systemvm/debian/config/root/func.sh +++ b/patches/systemvm/debian/config/root/func.sh @@ -21,10 +21,26 @@ # getLockFile() parameters # $1 lock filename # $2 timeout seconds + +#set -x + +getCurrLock() { + result=`ls $__LOCKDIR/*-$1.lock 2>/dev/null | head -n1` + while [ $? -ne 0 ] + do + result=`ls $__LOCKDIR/*-$1.lock 2>/dev/null| head -n1` + done + echo $result +} + getLockFile() { + lock=$1 + __locked=0 __TS=`date +%s%N` - __LOCKFILE="/tmp/$__TS-$$-$1.lock" + __LOCKDIR="/tmp" + __LOCKFILE="$__LOCKDIR/$__TS-$$-$lock.lock" + if [ $2 ] then __TIMEOUT=$2 @@ -34,7 +50,7 @@ getLockFile() { if [ -e $__LOCKFILE ] then - logger -t cloud "Process $0 pid $$ want to get ECLUSIVE LOCK $1 RECURSIVELY!" + logger -t cloud "Process $0 pid $$ want to get ECLUSIVE LOCK $lock RECURSIVELY!" psline=`ps u $$` logger -t cloud "Failed job detail: $psline" echo 0 @@ -47,26 +63,32 @@ getLockFile() { then return fi - + for i in `seq 1 $(($__TIMEOUT * 10))` do - currlock=`ls /tmp/*-$1.lock | head -n1` + currlock=$(getCurrLock $lock) if [ $currlock -ef $__LOCKFILE ] then __locked=1 break fi + sleep 0.1 if [ $((i % 10)) -eq 0 ] then - logger -t cloud "Process $0 pid $$ waiting for the lock $1 for another 1 second" + logger -t cloud "Process $0 pid $$ waiting for the lock $lock for another 1 second" fi done if [ $__locked -ne 1 ] then - logger -t cloud "fail to acquire the lock $1 for process $0 pid $$ after $__TIMEOUT seconds time out!" - cmd=`cat $currlock` - logger -t cloud "waiting for command: $cmd" + logger -t cloud "fail to acquire the lock $lock for process $0 pid $$ after $__TIMEOUT seconds time out!" + cmd=`cat $currlock 2>/dev/null` + if [ $? -eq 0 ] + then + logger -t cloud "waiting for process: $cmd" + else + logger -t cloud "didn't get info about process who we're waiting for" + fi psline=`ps u $$` logger -t cloud "Failed job detail: $psline" rm $__LOCKFILE @@ -78,7 +100,8 @@ getLockFile() { # $1 lock filename # $2 locked(1) or not(0) releaseLockFile() { - __LOCKFILE="/tmp/*-$$-$1.lock" + __LOCKDIR="/tmp" + __LOCKFILE="$__LOCKDIR/*-$$-$1.lock" __locked=$2 if [ "$__locked" == "1" ] then
