|
|
|
@ -938,7 +938,6 @@ function conflictList {
|
|
|
|
|
|
|
|
|
|
local retval
|
|
|
|
|
local escapedReplicaPath
|
|
|
|
|
local rsyncCmd
|
|
|
|
|
|
|
|
|
|
if [ -f "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__type]}$timestampCurrentFilename" ] && [ -f "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${TARGET[$__type]}$timestampCurrentFilename" ]; then
|
|
|
|
|
# Remove prepending replicaPaths
|
|
|
|
@ -1764,8 +1763,8 @@ function Sync {
|
|
|
|
|
## Step 3a & 3b
|
|
|
|
|
if [ "$resumeInitiator" == "${SYNC_ACTION[3]}" ] || [ "$resumeTarget" == "${SYNC_ACTION[3]}" ]; then
|
|
|
|
|
if [ "$LOG_CONFLICTS" == "yes" ]; then
|
|
|
|
|
conflictList "${INITIATOR[$__timestampCurrentFile]}" "${INITIATOR[$__timestampAfterFileNoSuffix]}" &
|
|
|
|
|
ExecTasks $! "${FUNCNAME[0]}" false 0 0 $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME false $SLEEP_TIME $KEEP_LOGGING
|
|
|
|
|
conflictList "${INITIATOR[$__timestampCurrentFile]}" "${INITIATOR[$__timestampAfterFileNoSuffix]}"
|
|
|
|
|
#ExecTasks $! "${FUNCNAME[0]}" false 0 0 $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME false $SLEEP_TIME $KEEP_LOGGING
|
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
|
echo "${SYNC_ACTION[3]}" > "${INITIATOR[$__initiatorLastActionFile]}"
|
|
|
|
|
echo "${SYNC_ACTION[3]}" > "${INITIATOR[$__targetLastActionFile]}"
|
|
|
|
|