WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensured writeLocks=false at beginning of lock handling

This commit is contained in:
deajan 2017-11-22 15:02:17 +01:00
parent 0b665be787
commit 71a0437de6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/n_osync.sh
View File

@ -8,7 +8,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2017 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2.2-dev PROGRAM_VERSION=1.2.2-dev
PROGRAM_BUILD=2017081401 PROGRAM_BUILD=2017112201
IS_STABLE=no IS_STABLE=no
@ -378,7 +378,7 @@ function _HandleLocksLocal {
local lockfileContent local lockfileContent
local lockPid local lockPid
local lockInstanceID local lockInstanceID
local writeLocks local writeLocks=false
if [ ! -d "$replicaStateDir" ]; then if [ ! -d "$replicaStateDir" ]; then
mkdir -p "$replicaStateDir" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$replicaType.$SCRIPT_PID.$TSTAMP" 2>&1 mkdir -p "$replicaStateDir" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$replicaType.$SCRIPT_PID.$TSTAMP" 2>&1
@ -466,6 +466,8 @@ include #### IsInteger SUBSET ####
include #### RemoteLogger SUBSET #### include #### RemoteLogger SUBSET ####
function _HandleLocksRemoteSub { function _HandleLocksRemoteSub {
local writeLocks=false
if [ ! -d "$replicaStateDir" ]; then if [ ! -d "$replicaStateDir" ]; then
mkdir -p "$replicaStateDir" mkdir -p "$replicaStateDir"
retval=$? retval=$?
@ -572,6 +574,7 @@ function HandleLocks {
_HandleLocksRemote "${TARGET[$__replicaDir]}${TARGET[$__stateDir]}" "${TARGET[$__lockFile]}" "${TARGET[$__type]}" $overwrite & _HandleLocksRemote "${TARGET[$__replicaDir]}${TARGET[$__stateDir]}" "${TARGET[$__lockFile]}" "${TARGET[$__type]}" $overwrite &
pids="$pids;$!" pids="$pids;$!"
fi fi
#Assume locks could be created unless pid returns with exit code
INITIATOR_LOCK_FILE_EXISTS=true INITIATOR_LOCK_FILE_EXISTS=true
TARGET_LOCK_FILE_EXISTS=true TARGET_LOCK_FILE_EXISTS=true
WaitForTaskCompletion $pids 720 1800 $SLEEP_TIME $KEEP_LOGGING true true false WaitForTaskCompletion $pids 720 1800 $SLEEP_TIME $KEEP_LOGGING true true false