@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR = "(C) 2013-2016 by Orsiris de Jong"
CONTACT = "http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION = 1.2-beta
PROGRAM_BUILD = 201608300 1
PROGRAM_BUILD = 201608300 3
IS_STABLE = no
# Execution order #__WITH_PARANOIA_DEBUG
@ -1514,31 +1514,31 @@ function TrapQuit {
if [ $ERROR_ALERT = = true ] ; then
UnlockReplicas
if [ " $_DEBUG " != "yes" ]
then
SendAlert
else
Logger "Debug mode, no alert mail will be sent." "NOTICE"
fi
if [ " $RUN_AFTER_CMD_ON_ERROR " = = "yes" ] ; then
RunAfterHook
fi
CleanUp
Logger " $PROGRAM finished with errors. " "ERROR"
exitcode = 1
elif [ $WARN_ALERT = = true ] ; then
UnlockReplicas
if [ " $_DEBUG " != "yes" ]
then
SendAlert
else
Logger "Debug mode, no alert mail will be sent." "NOTICE"
fi
exitcode = 1
elif [ $WARN_ALERT = = true ] ; then
UnlockReplicas
if [ " $RUN_AFTER_CMD_ON_ERROR " = = "yes" ] ; then
RunAfterHook
fi
CleanUp
Logger " $PROGRAM finished with warnings. " "WARN"
if [ " $_DEBUG " != "yes" ]
then
SendAlert
else
Logger "Debug mode, no alert mail will be sent." "NOTICE"
fi
exitcode = 2 # Warning exit code must not force daemon mode to quit
else
UnlockReplicas
@ -1673,23 +1673,23 @@ function CheckReplicaPaths {
local pids
# Use direct comparaison before having a portable realpath implementation
#INITIATOR_SYNC_DIR_CANN=$(realpath "${INITIATOR[ replicaDir]}") #TODO(verylow): investigate realpath & readlink issues on MSYS and busybox here
#TARGET_SYNC_DIR_CANN=$(realpath "${TARGET[ replicaDir]})
#INITIATOR_SYNC_DIR_CANN=$(realpath "${INITIATOR[ $__ replicaDir]}") #TODO(verylow): investigate realpath & readlink issues on MSYS and busybox here
#TARGET_SYNC_DIR_CANN=$(realpath "${TARGET[ $__ replicaDir]})
if [ " $REMOTE_OPERATION " != "yes" ] ; then
if [ " ${ INITIATOR [ replicaDir]} " = = " ${ TARGET [ replicaDir]} " ] ; then
Logger " Initiator and target path [ ${ INITIATOR [ replicaDir]} ] cannot be the same. " "CRITICAL"
if [ " ${ INITIATOR [ $__ } " = = " ${ TARGET [ $__ } " ] ; then
Logger " Initiator and target path [ ${ INITIATOR [ $__ } ] cannot be the same. " "CRITICAL"
exit 1
fi
fi
_CheckReplicaPathsLocal " ${ INITIATOR [ replicaDir]} " &
_CheckReplicaPathsLocal " ${ INITIATOR [ $__ } " &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_CheckReplicaPathsLocal " ${ TARGET [ replicaDir]} " &
_CheckReplicaPathsLocal " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
else
_CheckReplicaPathsRemote " ${ TARGET [ replicaDir]} " &
_CheckReplicaPathsRemote " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } false $KEEP_LOGGING
@ -1749,13 +1749,13 @@ function CheckDiskSpace {
return 0
fi
_CheckDiskSpaceLocal " ${ INITIATOR [ replicaDir]} " &
_CheckDiskSpaceLocal " ${ INITIATOR [ $__ } " &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_CheckDiskSpaceLocal " ${ TARGET [ replicaDir]} " &
_CheckDiskSpaceLocal " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
else
_CheckDiskSpaceRemote " ${ TARGET [ replicaDir]} " &
_CheckDiskSpaceRemote " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -1800,13 +1800,13 @@ function CreateStateDirs {
local pids
_CreateStateDirsLocal " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} " &
_CreateStateDirsLocal " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } " &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_CreateStateDirsLocal " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} " &
_CreateStateDirsLocal " ${ TARGET [ $__ } ${ TARGET [ $__ } " &
pids = " $pids ; $! "
else
_CreateStateDirsRemote " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} " &
_CreateStateDirsRemote " ${ TARGET [ $__ } ${ TARGET [ $__ } " &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -1905,13 +1905,13 @@ function CheckLocks {
fi
fi
_CheckLocksLocal " ${ INITIATOR [ lockFile]} " &
_CheckLocksLocal " ${ INITIATOR [ $__ } " &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_CheckLocksLocal " ${ TARGET [ lockFile]} " &
_CheckLocksLocal " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
else
_CheckLocksRemote " ${ TARGET [ lockFile]} " &
_CheckLocksRemote " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -1965,14 +1965,14 @@ function WriteLockFiles {
local pidArray
local pid
_WriteLockFilesLocal " ${ INITIATOR [ lockFile]} " " ${ INITIATOR [ type]} " &
_WriteLockFilesLocal " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
initiatorPid = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_WriteLockFilesLocal " ${ TARGET [ lockFile]} " " ${ TARGET [ type]} " &
_WriteLockFilesLocal " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " &
targetPid = " $! "
else
_WriteLockFilesRemote " ${ TARGET [ lockFile]} " " ${ TARGET [ type]} " &
_WriteLockFilesRemote " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " &
targetPid = " $! "
fi
@ -2039,16 +2039,16 @@ function UnlockReplicas {
fi
if [ $INITIATOR_LOCK_FILE_EXISTS = = true ] ; then
_UnlockReplicasLocal " ${ INITIATOR [ lockFile]} " &
_UnlockReplicasLocal " ${ INITIATOR [ $__ } " &
pids = " $! "
fi
if [ $TARGET_LOCK_FILE_EXISTS = = true ] ; then
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_UnlockReplicasLocal " ${ TARGET [ lockFile]} " &
_UnlockReplicasLocal " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
else
_UnlockReplicasRemote " ${ TARGET [ lockFile]} " &
_UnlockReplicasRemote " ${ TARGET [ $__ } " &
pids = " $pids ; $! "
fi
fi
@ -2078,7 +2078,7 @@ function tree_list {
escaped_replica_path = $( EscapeSpaces " $replica_path " )
Logger " Creating $replica_type replica file list [ $replica_path ]. " "NOTICE"
if [ " $REMOTE_OPERATION " = = "yes" ] && [ " $replica_type " = = " ${ TARGET [ type]} " ] ; then
if [ " $REMOTE_OPERATION " = = "yes" ] && [ " $replica_type " = = " ${ TARGET [ $__ } " ] ; then
CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS -8 --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE -e \" $RSYNC_SSH_CMD \" --list-only $REMOTE_USER @ $REMOTE_HOST :\" $escaped_replica_path /\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\. $\" || :) | sort > \" $RUN_DIR / $PROGRAM . $replica_type . $SCRIPT_PID \" "
@ -2092,7 +2092,7 @@ function tree_list {
retval = $?
## Retval 24 = some files vanished while creating list
if ( [ $retval = = 0 ] || [ $retval = = 24 ] ) && [ -f " $RUN_DIR / $PROGRAM . $replica_type . $SCRIPT_PID " ] ; then
mv -f " $RUN_DIR / $PROGRAM . $replica_type . $SCRIPT_PID " " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $tree_filename "
mv -f " $RUN_DIR / $PROGRAM . $replica_type . $SCRIPT_PID " " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $tree_filename "
return $?
else
Logger " Cannot create replica file list in [ $replica_path ]. " "CRITICAL"
@ -2112,13 +2112,13 @@ function delete_list {
local cmd
Logger " Creating $replica_type replica deleted file list. " "NOTICE"
if [ -f " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type ${ INITIATOR [ treeAfterFile]} _NO_SUFFIX " ] ; then
if [ -f " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type ${ INITIATOR [ $__ } _NO_SUFFIX " ] ; then
## Same functionnality, comm is much faster than grep but is not available on every platform
if type comm > /dev/null 2>& 1 ; then
cmd = " comm -23 \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type ${ INITIATOR [ treeAfterFileNoSuffix]} \" \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $tree_file_current \" > \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_list_file \" "
cmd = " comm -23 \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type ${ INITIATOR [ $__ } \" \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $tree_file_current \" > \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_list_file \" "
else
## The || : forces the command to have a good result
cmd = " (grep -F -x -v -f \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $tree_file_current \" \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type ${ INITIATOR [ treeAfterFileNoSuffix]} \" || :) > \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_list_file \" "
cmd = " (grep -F -x -v -f \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $tree_file_current \" \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type ${ INITIATOR [ $__ } \" || :) > \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_list_file \" "
fi
Logger " CMD: $cmd " "DEBUG"
@ -2126,14 +2126,14 @@ function delete_list {
retval = $?
# Add delete failed file list to current delete list and then empty it
if [ -f " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_failed_list_file " ] ; then
cat " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_failed_list_file " >> " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_list_file "
rm -f " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_failed_list_file "
if [ -f " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_failed_list_file " ] ; then
cat " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_failed_list_file " >> " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_list_file "
rm -f " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_failed_list_file "
fi
return $retval
else
touch " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $replica_type $deleted_list_file "
touch " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $replica_type $deleted_list_file "
return $retval
fi
}
@ -2181,7 +2181,7 @@ function _get_file_ctime_mtime_remote {
function sync_attrs {
local initiator_replica = " ${ 1 } "
local target_replica = " ${ 2 } "
local delete_list_filename = " ${ INITIATOR [ deletedListFile]} " # Contains deleted list filename, will be prefixed with replica type
local delete_list_filename = " ${ INITIATOR [ $__ } " # Contains deleted list filename, will be prefixed with replica type
__CheckArguments 2 $# ${ FUNCNAME [0] } " $@ " #__WITH_PARANOIA_DEBUG
local rsync_cmd
@ -2222,15 +2222,15 @@ function sync_attrs {
fi
Logger "Getting ctimes for pending files on initiator." "NOTICE"
_get_file_ctime_mtime_local " ${ INITIATOR [ replicaDir]} " " ${ INITIATOR [ type]} " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
_get_file_ctime_mtime_local " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
pids = " $! "
Logger "Getting ctimes for pending files on target." "NOTICE"
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_get_file_ctime_mtime_local " ${ TARGET [ replicaDir]} " " ${ TARGET [ type]} " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
_get_file_ctime_mtime_local " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
pids = " $pids ; $! "
else
_get_file_ctime_mtime_remote " ${ TARGET [ replicaDir]} " " ${ TARGET [ type]} " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
_get_file_ctime_mtime_remote " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -cleaned. $SCRIPT_PID " &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 1800 0 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -2238,23 +2238,23 @@ function sync_attrs {
# If target gets updated first, then sync_attr must update initiator's attrs first
# For join, remove leading replica paths
sed -i'.tmp' " s;^ ${ INITIATOR [ replicaDir]} ;;g " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ type]} . $SCRIPT_PID "
sed -i'.tmp' " s;^ ${ TARGET [ replicaDir]} ;;g " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ type]} . $SCRIPT_PID "
sed -i'.tmp' " s;^ ${ INITIATOR [ $__ } ;;g " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ $__ } . $SCRIPT_PID "
sed -i'.tmp' " s;^ ${ TARGET [ $__ } ;;g " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ $__ } . $SCRIPT_PID "
if [ " $CONFLICT_PREVALANCE " = = " ${ TARGET [ type]} " ] ; then
local source_dir = " ${ INITIATOR [ replicaDir]} "
esc_source_dir = $( EscapeSpaces " ${ INITIATOR [ replicaDir]} " )
local dest_dir = " ${ TARGET [ replicaDir]} "
esc_dest_dir = $( EscapeSpaces " ${ TARGET [ replicaDir]} " )
local dest_replica = " ${ TARGET [ type]} "
join -j 1 -t ';' -o 1.1,1.2,2.2 " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ type]} . $SCRIPT_PID " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ type]} . $SCRIPT_PID " | awk -F';' '{if ($2 > $3) print $1}' > " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID "
if [ " $CONFLICT_PREVALANCE " = = " ${ TARGET [ $__ } " ] ; then
local source_dir = " ${ INITIATOR [ $__ } "
esc_source_dir = $( EscapeSpaces " ${ INITIATOR [ $__ } " )
local dest_dir = " ${ TARGET [ $__ } "
esc_dest_dir = $( EscapeSpaces " ${ TARGET [ $__ } " )
local dest_replica = " ${ TARGET [ $__ } "
join -j 1 -t ';' -o 1.1,1.2,2.2 " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ $__ } . $SCRIPT_PID " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ $__ } . $SCRIPT_PID " | awk -F';' '{if ($2 > $3) print $1}' > " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID "
else
local source_dir = " ${ TARGET [ replicaDir]} "
esc_source_dir = $( EscapeSpaces " ${ TARGET [ replicaDir]} " )
local dest_dir = " ${ INITIATOR [ replicaDir]} "
esc_dest_dir = $( EscapeSpaces " ${ INITIATOR [ replicaDir]} " )
local dest_replica = " ${ INITIATOR [ type]} "
join -j 1 -t ';' -o 1.1,1.2,2.2 " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ type]} . $SCRIPT_PID " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ type]} . $SCRIPT_PID " | awk -F';' '{if ($2 > $3) print $1}' > " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID "
local source_dir = " ${ TARGET [ $__ } "
esc_source_dir = $( EscapeSpaces " ${ TARGET [ $__ } " )
local dest_dir = " ${ INITIATOR [ $__ } "
esc_dest_dir = $( EscapeSpaces " ${ INITIATOR [ $__ } " )
local dest_replica = " ${ INITIATOR [ $__ } "
join -j 1 -t ';' -o 1.1,1.2,2.2 " $RUN_DIR / $PROGRAM .ctime_mtime. ${ TARGET [ $__ } . $SCRIPT_PID " " $RUN_DIR / $PROGRAM .ctime_mtime. ${ INITIATOR [ $__ } . $SCRIPT_PID " | awk -F';' '{if ($2 > $3) print $1}' > " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID "
fi
if [ $( wc -l < " $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID " ) -eq 0 ] ; then
@ -2269,13 +2269,13 @@ function sync_attrs {
CheckConnectivityRemoteHost
# No rsync args (hence no -r) because files are selected with --from-file
if [ " $dest_replica " = = " ${ INITIATOR [ type]} " ] ; then
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ INITIATOR [ type]} $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ TARGET [ type]} $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
if [ " $dest_replica " = = " ${ INITIATOR [ $__ } " ] ; then
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ INITIATOR [ $__ } $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ TARGET [ $__ } $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
else
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ INITIATOR [ type]} $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ TARGET [ type]} $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" \" $source_dir \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ INITIATOR [ $__ } $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ TARGET [ $__ } $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" \" $source_dir \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
fi
else
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ INITIATOR [ type]} $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / ${ TARGET [ type]} $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" \" $source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $SYNC_OPTS --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ INITIATOR [ $__ } $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / ${ TARGET [ $__ } $delete_list_filename \" --files-from=\" $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } -ctime_files. $SCRIPT_PID \" \" $source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .attr-update. $dest_replica . $SCRIPT_PID 2>&1 & "
fi
@ -2312,32 +2312,32 @@ function sync_update {
local esc_dest_dir
Logger " Updating $destination_replica replica. " "NOTICE"
if [ " $source_replica " = = " ${ INITIATOR [ type]} " ] ; then
local source_dir = " ${ INITIATOR [ replicaDir]} "
local dest_dir = " ${ TARGET [ replicaDir]} "
if [ " $source_replica " = = " ${ INITIATOR [ $__ } " ] ; then
local source_dir = " ${ INITIATOR [ $__ } "
local dest_dir = " ${ TARGET [ $__ } "
local backup_args = " $TARGET_BACKUP "
esc_source_dir = $( EscapeSpaces " ${ INITIATOR [ replicaDir]} " )
esc_dest_dir = $( EscapeSpaces " ${ TARGET [ replicaDir]} " )
esc_source_dir = $( EscapeSpaces " ${ INITIATOR [ $__ } " )
esc_dest_dir = $( EscapeSpaces " ${ TARGET [ $__ } " )
else
local source_dir = " ${ TARGET [ replicaDir]} "
local dest_dir = " ${ INITIATOR [ replicaDir]} "
local source_dir = " ${ TARGET [ $__ } "
local dest_dir = " ${ INITIATOR [ $__ } "
local backup_args = " $INITIATOR_BACKUP "
esc_source_dir = $( EscapeSpaces " ${ TARGET [ replicaDir]} " )
esc_dest_dir = $( EscapeSpaces " ${ INITIATOR [ replicaDir]} " )
esc_source_dir = $( EscapeSpaces " ${ TARGET [ $__ } " )
esc_dest_dir = $( EscapeSpaces " ${ INITIATOR [ $__ } " )
fi
if [ " $REMOTE_OPERATION " = = "yes" ] ; then
CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost
if [ " $source_replica " = = " ${ INITIATOR [ type]} " ] ; then
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $source_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $destination_replica $delete_list_filename \" \" $source_dir \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
if [ " $source_replica " = = " ${ INITIATOR [ $__ } " ] ; then
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $source_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $destination_replica $delete_list_filename \" \" $source_dir \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
else
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $destination_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $source_replica $delete_list_filename \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS -e \" $RSYNC_SSH_CMD \" $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $destination_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $source_replica $delete_list_filename \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
fi
else
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $source_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $destination_replica $delete_list_filename \" \" $source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" $RSYNC_ARGS $RSYNC_DRY_ARG $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS $SYNC_OPTS $backup_args --exclude \" $OSYNC_DIR \" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $source_replica $delete_list_filename \" --exclude-from=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $destination_replica $delete_list_filename \" \" $source_dir \" \" $dest_dir \" >> $RUN_DIR / $PROGRAM .update. $destination_replica . $SCRIPT_PID 2>&1 "
fi
Logger " RSYNC_CMD: $rsync_cmd " "DEBUG"
eval " $rsync_cmd "
@ -2401,7 +2401,7 @@ function _delete_local {
fi
if [ $? != 0 ] ; then
Logger " Cannot move [ $replica_dir $files ] to deletion directory. " "ERROR"
echo " $files " >> " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $deleted_failed_list_file "
echo " $files " >> " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $deleted_failed_list_file "
fi
fi
fi
@ -2413,14 +2413,14 @@ function _delete_local {
Logger " Deleting [ $replica_dir $files ]. " "VERBOSE"
if [ $result != 0 ] ; then
Logger " Cannot delete [ $replica_dir $files ]. " "ERROR"
echo " $files " >> " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $deleted_failed_list_file "
echo " $files " >> " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $deleted_failed_list_file "
fi
fi
fi
fi
previous_file = " $files "
fi
done < " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $deleted_list_file "
done < " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $deleted_list_file "
}
function _delete_remote {
@ -2437,8 +2437,8 @@ function _delete_remote {
## Anything beetween << ENDSSH and ENDSSH will be executed remotely
# Additionnaly, we need to copy the deletetion list to the remote state folder
esc_dest_dir = " $( EscapeSpaces " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} " ) "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" -e \" $RSYNC_SSH_CMD \" \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} / $deleted_list_file \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir /\" >> $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } .precopy. $SCRIPT_PID 2>&1 "
esc_dest_dir = " $( EscapeSpaces " ${ TARGET [ $__ } ${ TARGET [ $__ } " ) "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" -e \" $RSYNC_SSH_CMD \" \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } / $deleted_list_file \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_dest_dir /\" >> $RUN_DIR / $PROGRAM . ${ FUNCNAME [0] } .precopy. $SCRIPT_PID 2>&1 "
Logger " RSYNC_CMD: $rsync_cmd " "DEBUG"
eval " $rsync_cmd " 2>> " $LOG_FILE "
if [ $? != 0 ] ; then
@ -2449,7 +2449,7 @@ function _delete_remote {
exit 1
fi
$SSH_CMD ERROR_ALERT = 0 sync_on_changes = $sync_on_changes _DEBUG = $_DEBUG _DRYRUN = $_DRYRUN _VERBOSE = $_VERBOSE COMMAND_SUDO = $COMMAND_SUDO FILE_LIST = " $( EscapeSpaces " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} / $deleted_list_file " ) " REPLICA_DIR = " $( EscapeSpaces " $replica_dir " ) " SOFT_DELETE = $SOFT_DELETE DELETE_DIR = " $( EscapeSpaces " $deletion_dir " ) " FAILED_DELETE_LIST = " $( EscapeSpaces " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} / $deleted_failed_list_file " ) " 'bash -s' << 'ENDSSH' >> " $RUN_DIR / $PROGRAM .remote_deletion. $SCRIPT_PID " 2>& 1
$SSH_CMD ERROR_ALERT = 0 sync_on_changes = $sync_on_changes _DEBUG = $_DEBUG _DRYRUN = $_DRYRUN _VERBOSE = $_VERBOSE COMMAND_SUDO = $COMMAND_SUDO FILE_LIST = " $( EscapeSpaces " ${ TARGET [ $__ } ${ TARGET [ $__ } / $deleted_list_file " ) " REPLICA_DIR = " $( EscapeSpaces " $replica_dir " ) " SOFT_DELETE = $SOFT_DELETE DELETE_DIR = " $( EscapeSpaces " $deletion_dir " ) " FAILED_DELETE_LIST = " $( EscapeSpaces " ${ TARGET [ $__ } ${ TARGET [ $__ } / $deleted_failed_list_file " ) " 'bash -s' << 'ENDSSH' >> " $RUN_DIR / $PROGRAM .remote_deletion. $SCRIPT_PID " 2>& 1
## The following lines are executed remotely
function _logger {
@ -2556,8 +2556,8 @@ ENDSSH
fi
## Copy back the deleted failed file list
esc_source_file = " $( EscapeSpaces " ${ TARGET [ replicaDir]} ${ TARGET [ stateDir]} / $deleted_failed_list_file " ) "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" -e \" $RSYNC_SSH_CMD \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_file \" \" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ stateDir]} \" > \" $RUN_DIR / $PROGRAM .remote_failed_deletion_list_copy. $SCRIPT_PID \" "
esc_source_file = " $( EscapeSpaces " ${ TARGET [ $__ } ${ TARGET [ $__ } / $deleted_failed_list_file " ) "
rsync_cmd = " $( type -p $RSYNC_EXECUTABLE ) --rsync-path=\" $RSYNC_PATH \" -e \" $RSYNC_SSH_CMD \" $REMOTE_USER @ $REMOTE_HOST :\" $esc_source_file \" \" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } \" > \" $RUN_DIR / $PROGRAM .remote_failed_deletion_list_copy. $SCRIPT_PID \" "
Logger " RSYNC_CMD: $rsync_cmd " "DEBUG"
eval " $rsync_cmd " 2>> " $LOG_FILE "
result = $?
@ -2583,24 +2583,24 @@ function deletion_propagation {
Logger " Propagating deletions to $replica_type replica. " "NOTICE"
if [ " $replica_type " = = " ${ INITIATOR [ type]} " ] ; then
replica_dir = " ${ INITIATOR [ replicaDir]} "
delete_dir = " ${ INITIATOR [ deleteDir]} "
if [ " $replica_type " = = " ${ INITIATOR [ $__ } " ] ; then
replica_dir = " ${ INITIATOR [ $__ } "
delete_dir = " ${ INITIATOR [ $__ } "
_delete_local " $replica_dir " " ${ TARGET [ type]} $deleted_list_file " " $delete_dir " " ${ TARGET [ type]} $deleted_failed_list_file "
_delete_local " $replica_dir " " ${ TARGET [ $__ } $deleted_list_file " " $delete_dir " " ${ TARGET [ $__ } $deleted_failed_list_file "
retval = $?
if [ $retval != 0 ] ; then
Logger " Deletion on replica $replica_type failed. " "CRITICAL"
exit 1
fi
else
replica_dir = " ${ TARGET [ replicaDir]} "
delete_dir = " ${ TARGET [ deleteDir]} "
replica_dir = " ${ TARGET [ $__ } "
delete_dir = " ${ TARGET [ $__ } "
if [ " $REMOTE_OPERATION " = = "yes" ] ; then
_delete_remote " $replica_dir " " ${ INITIATOR [ type]} $deleted_list_file " " $delete_dir " " ${ INITIATOR [ type]} $deleted_failed_list_file "
_delete_remote " $replica_dir " " ${ INITIATOR [ $__ } $deleted_list_file " " $delete_dir " " ${ INITIATOR [ $__ } $deleted_failed_list_file "
else
_delete_local " $replica_dir " " ${ INITIATOR [ type]} $deleted_list_file " " $delete_dir " " ${ INITIATOR [ type]} $deleted_failed_list_file "
_delete_local " $replica_dir " " ${ INITIATOR [ $__ } $deleted_list_file " " $delete_dir " " ${ INITIATOR [ $__ } $deleted_failed_list_file "
fi
retval = $?
if [ $retval = = 0 ] ; then
@ -2645,41 +2645,41 @@ function Sync {
CheckConnectivityRemoteHost
if [ " $RESUME_SYNC " != "no" ] ; then
if [ -f " ${ INITIATOR [ resumeCount]} " ] ; then
resumeCount = $( cat " ${ INITIATOR [ resumeCount]} " )
if [ -f " ${ INITIATOR [ $__ } " ] ; then
resumeCount = $( cat " ${ INITIATOR [ $__ } " )
else
resumeCount = 0
fi
if [ $resumeCount -lt $RESUME_TRY ] ; then
if [ -f " ${ INITIATOR [ initiatorLastActionFile]} " ] ; then
resumeInitiator = $( cat " ${ INITIATOR [ initiatorLastActionFile]} " )
if [ -f " ${ INITIATOR [ $__ } " ] ; then
resumeInitiator = $( cat " ${ INITIATOR [ $__ } " )
else
resumeInitiator = "synced"
fi
if [ -f " ${ INITIATOR [ targetLastActionFile]} " ] ; then
resumeTarget = $( cat " ${ INITIATOR [ targetLastActionFile]} " )
if [ -f " ${ INITIATOR [ $__ } " ] ; then
resumeTarget = $( cat " ${ INITIATOR [ $__ } " )
else
resumeTarget = "synced"
fi
if [ " $resumeInitiator " != "synced" ] ; then
Logger " WARNING: Trying to resume aborted execution on $( $STAT_CMD " ${ INITIATOR [ initiatorLastActionFile]} " ) at task [ $resumeInitiator ] for initiator. [ $resumeCount ] previous tries. " "WARN"
echo $(( $resumeCount + 1 )) > " ${ INITIATOR [ resumeCount]} "
Logger " WARNING: Trying to resume aborted execution on $( $STAT_CMD " ${ INITIATOR [ $__ } " ) at task [ $resumeInitiator ] for initiator. [ $resumeCount ] previous tries. " "WARN"
echo $(( $resumeCount + 1 )) > " ${ INITIATOR [ $__ } "
else
resumeInitiator = "none"
fi
if [ " $resumeTarget " != "synced" ] ; then
Logger " WARNING: Trying to resume aborted execution on $( $STAT_CMD " ${ INITIATOR [ targetLastActionFile]} " ) as task [ $resumeTarget ] for target. [ $resumeCount ] previous tries. " "WARN"
echo $(( $resumeCount + 1 )) > " ${ INITIATOR [ resumeCount]} "
Logger " WARNING: Trying to resume aborted execution on $( $STAT_CMD " ${ INITIATOR [ $__ } " ) as task [ $resumeTarget ] for target. [ $resumeCount ] previous tries. " "WARN"
echo $(( $resumeCount + 1 )) > " ${ INITIATOR [ $__ } "
else
resumeTarget = "none"
fi
else
Logger " Will not resume aborted execution. Too many resume tries [ $resumeCount ]. " "WARN"
echo "0" > " ${ INITIATOR [ resumeCount]} "
echo "0" > " ${ INITIATOR [ $__ } "
resumeInitiator = "none"
resumeTarget = "none"
fi
@ -2694,12 +2694,12 @@ function Sync {
## Step 0a & 0b
if [ " $resumeInitiator " = = "none" ] || [ " $resumeTarget " = = "none" ] || [ " $resumeInitiator " = = " ${ SYNC_ACTION [0] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [0] } " ] ; then
if [ " $resumeInitiator " = = "none" ] || [ " $resumeInitiator " = = " ${ SYNC_ACTION [0] } " ] ; then
tree_list " ${ INITIATOR [ replicaDir]} " " ${ INITIATOR [ type]} " " ${ INITIATOR [ treeCurrentFile]} " &
tree_list " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
initiatorPid = " $! "
fi
if [ " $resumeTarget " = = "none" ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [0] } " ] ; then
tree_list " ${ TARGET [ replicaDir]} " " ${ TARGET [ type]} " " ${ INITIATOR [ treeCurrentFile]} " &
tree_list " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " &
targetPid = " $! "
fi
@ -2711,26 +2711,26 @@ function Sync {
for pid in " ${ pidArray [@] } " ; do
pid = ${ pid % : * }
if [ $pid = = $initiatorPid ] ; then
echo " ${ SYNC_ACTION [0] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [0] } " > " ${ INITIATOR [ $__ } "
initiatorFail = true
elif [ $pid = = $targetPid ] ; then
echo " ${ SYNC_ACTION [0] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [0] } " > " ${ INITIATOR [ $__ } "
targetFail = true
fi
done
if [ $initiatorFail = = false ] ; then
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
fi
if [ $targetFail = = false ] ; then
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
fi
exit 1
else
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [1] } "
resumeTarget = " ${ SYNC_ACTION [1] } "
fi
@ -2739,12 +2739,12 @@ function Sync {
## Step 1a & 1b
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [1] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [1] } " ] ; then
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [1] } " ] ; then
delete_list " ${ INITIATOR [ type]} " " ${ INITIATOR [ treeAfterFile]} " " ${ INITIATOR [ treeCurrentFile]} " " ${ INITIATOR [ deletedListFile]} " " ${ INITIATOR [ failedDeletedListFile]} " &
delete_list " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
initiatorPid = " $! "
fi
if [ " $resumeTarget " = = " ${ SYNC_ACTION [1] } " ] ; then
delete_list " ${ TARGET [ type]} " " ${ INITIATOR [ treeAfterFile]} " " ${ INITIATOR [ treeCurrentFile]} " " ${ INITIATOR [ deletedListFile]} " " ${ INITIATOR [ failedDeletedListFile]} " &
delete_list " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
targetPid = " $! "
fi
@ -2756,26 +2756,26 @@ function Sync {
for pid in " ${ pidArray [@] } " ; do
pid = ${ pid % : * }
if [ $pid = = $initiatorPid ] ; then
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
initiatorFail = true
elif [ $pid = = $targetPid ] ; then
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [1] } " > " ${ INITIATOR [ $__ } "
targetFail = true
fi
done
if [ $initiatorFail = = false ] ; then
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
fi
if [ $targetFail = = false ] ; then
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
fi
exit 1
else
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [2] } "
resumeTarget = " ${ SYNC_ACTION [2] } "
fi
@ -2784,22 +2784,22 @@ function Sync {
## Step 2
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [2] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [2] } " ] ; then
if [ " $RSYNC_ATTR_ARGS " != "" ] ; then
sync_attrs " ${ INITIATOR [ replicaDir]} " " $TARGET_SYNC_DIR "
sync_attrs " ${ INITIATOR [ $__ } " " $TARGET_SYNC_DIR "
WaitForTaskCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${ FUNCNAME [0] } false $KEEP_LOGGING
if [ $? != 0 ] ; then
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [2] } " > " ${ INITIATOR [ $__ } "
exit 1
else
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [3] } "
resumeTarget = " ${ SYNC_ACTION [3] } "
fi
else
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [3] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [3] } "
resumeTarget = " ${ SYNC_ACTION [3] } "
fi
@ -2807,33 +2807,33 @@ function Sync {
## Step 3a & 3b
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [3] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [3] } " ] ; then
if [ " $CONFLICT_PREVALANCE " = = " ${ TARGET [ type]} " ] ; then
if [ " $CONFLICT_PREVALANCE " = = " ${ TARGET [ $__ } " ] ; then
if [ " $resumeTarget " = = " ${ SYNC_ACTION [3] } " ] ; then
sync_update " ${ TARGET [ type]} " " ${ INITIATOR [ type]} " " ${ INITIATOR [ deletedListFile]} "
sync_update " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } "
if [ $? = = 0 ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
resumeTarget = " ${ SYNC_ACTION [4] } "
fi
fi
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [3] } " ] ; then
sync_update " ${ INITIATOR [ type]} " " ${ TARGET [ type]} " " ${ INITIATOR [ deletedListFile]} "
sync_update " ${ INITIATOR [ $__ } " " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } "
if [ $? = = 0 ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [4] } "
fi
fi
else
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [3] } " ] ; then
sync_update " ${ INITIATOR [ type]} " " ${ TARGET [ type]} " " ${ INITIATOR [ deletedListFile]} "
sync_update " ${ INITIATOR [ $__ } " " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } "
if [ $? = = 0 ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [4] } "
fi
fi
if [ " $resumeTarget " = = " ${ SYNC_ACTION [3] } " ] ; then
sync_update " ${ TARGET [ type]} " " ${ INITIATOR [ type]} " " ${ INITIATOR [ deletedListFile]} "
sync_update " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } "
if [ $? = = 0 ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
resumeTarget = " ${ SYNC_ACTION [4] } "
fi
fi
@ -2843,12 +2843,12 @@ function Sync {
## Step 4a & 4b
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [4] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [4] } " ] ; then
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [4] } " ] ; then
deletion_propagation " ${ TARGET [ type]} " " ${ INITIATOR [ deletedListFile]} " " ${ INITIATOR [ failedDeletedListFile]} " &
deletion_propagation " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
initiatorPid = " $! "
fi
if [ " $resumeTarget " = = " ${ SYNC_ACTION [4] } " ] ; then
deletion_propagation " ${ INITIATOR [ type]} " " ${ INITIATOR [ deletedListFile]} " " ${ INITIATOR [ failedDeletedListFile]} " &
deletion_propagation " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
targetPid = " $! "
fi
@ -2860,26 +2860,26 @@ function Sync {
for pid in " ${ pidArray [@] } " ; do
pid = ${ pid % : * }
if [ $pid = = $initiatorPid ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
initiatorFail = true
elif [ $pid = = $targetPid ] ; then
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [4] } " > " ${ INITIATOR [ $__ } "
targetFail = true
fi
done
if [ $initiatorFail = = false ] ; then
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
fi
if [ $targetFail = = false ] ; then
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
fi
exit 1
else
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [5] } "
resumeTarget = " ${ SYNC_ACTION [5] } "
@ -2889,12 +2889,12 @@ function Sync {
## Step 5a & 5b
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [5] } " ] || [ " $resumeTarget " = = " ${ SYNC_ACTION [5] } " ] ; then
if [ " $resumeInitiator " = = " ${ SYNC_ACTION [5] } " ] ; then
tree_list " ${ INITIATOR [ replicaDir]} " " ${ INITIATOR [ type]} " " ${ INITIATOR [ treeAfterFile]} " &
tree_list " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } " &
initiatorPid = " $! "
fi
if [ " $resumeTarget " = = " ${ SYNC_ACTION [5] } " ] ; then
tree_list " ${ TARGET [ replicaDir]} " " ${ TARGET [ type]} " " ${ INITIATOR [ treeAfterFile]} " &
tree_list " ${ TARGET [ $__ } " " ${ TARGET [ $__ } " " ${ INITIATOR [ $__ } " &
targetPid = " $! "
fi
@ -2906,33 +2906,33 @@ function Sync {
for pid in " ${ pidArray [@] } " ; do
pid = ${ pid % : * }
if [ $pid = = $initiatorPid ] ; then
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
initiatorFail = true
elif [ $pid = = $targetPid ] ; then
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [5] } " > " ${ INITIATOR [ $__ } "
targetFail = true
fi
done
if [ $initiatorFail = = false ] ; then
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ $__ } "
fi
if [ $targetFail = = false ] ; then
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ $__ } "
fi
exit 1
else
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ initiatorLastActionFile]} "
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ targetLastActionFile]} "
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ $__ } "
echo " ${ SYNC_ACTION [6] } " > " ${ INITIATOR [ $__ } "
resumeInitiator = " ${ SYNC_ACTION [6] } "
resumeTarget = " ${ SYNC_ACTION [6] } "
fi
fi
Logger "Finished synchronization task." "NOTICE"
echo "0" > " ${ INITIATOR [ resumeCount]} "
echo "0" > " ${ INITIATOR [ $__ } "
}
function _SoftDeleteLocal {
@ -3027,13 +3027,13 @@ function SoftDelete {
if [ " $CONFLICT_BACKUP " != "no" ] && [ $CONFLICT_BACKUP_DAYS -ne 0 ] ; then
Logger "Running conflict backup cleanup." "NOTICE"
_SoftDeleteLocal " ${ INITIATOR [ type]} " " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ backupDir]} " $CONFLICT_BACKUP_DAYS &
_SoftDeleteLocal " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } " $CONFLICT_BACKUP_DAYS &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_SoftDeleteLocal " ${ TARGET [ type]} " " ${ TARGET [ replicaDir]} ${ TARGET [ backupDir]} " $CONFLICT_BACKUP_DAYS &
_SoftDeleteLocal " ${ TARGET [ $__ } " " ${ TARGET [ $__ } ${ TARGET [ $__ } " $CONFLICT_BACKUP_DAYS &
pids = " $pids ; $! "
else
_SoftDeleteRemote " ${ TARGET [ type]} " " ${ TARGET [ replicaDir]} ${ TARGET [ backupDir]} " $CONFLICT_BACKUP_DAYS &
_SoftDeleteRemote " ${ TARGET [ $__ } " " ${ TARGET [ $__ } ${ TARGET [ $__ } " $CONFLICT_BACKUP_DAYS &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -3042,13 +3042,13 @@ function SoftDelete {
if [ " $SOFT_DELETE " != "no" ] && [ $SOFT_DELETE_DAYS -ne 0 ] ; then
Logger "Running soft deletion cleanup." "NOTICE"
_SoftDeleteLocal " ${ INITIATOR [ type]} " " ${ INITIATOR [ replicaDir]} ${ INITIATOR [ deleteDir]} " $SOFT_DELETE_DAYS &
_SoftDeleteLocal " ${ INITIATOR [ $__ } " " ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } " $SOFT_DELETE_DAYS &
pids = " $! "
if [ " $REMOTE_OPERATION " != "yes" ] ; then
_SoftDeleteLocal " ${ TARGET [ type]} " " ${ TARGET [ replicaDir]} ${ TARGET [ deleteDir]} " $SOFT_DELETE_DAYS &
_SoftDeleteLocal " ${ TARGET [ $__ } " " ${ TARGET [ $__ } ${ TARGET [ $__ } " $SOFT_DELETE_DAYS &
pids = " $pids ; $! "
else
_SoftDeleteRemote " ${ TARGET [ type]} " " ${ TARGET [ replicaDir]} ${ TARGET [ deleteDir]} " $SOFT_DELETE_DAYS &
_SoftDeleteRemote " ${ TARGET [ $__ } " " ${ TARGET [ $__ } ${ TARGET [ $__ } " $SOFT_DELETE_DAYS &
pids = " $pids ; $! "
fi
WaitForTaskCompletion $pids 720 1800 ${ FUNCNAME [0] } true $KEEP_LOGGING
@ -3132,32 +3132,49 @@ function Init {
local dry_suffix =
fi
declare -gA INITIATOR
INITIATOR[ type] = 'initiator'
INITIATOR[ replicaDir] = " $INITIATOR_SYNC_DIR "
INITIATOR[ lockFile] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $lock_filename "
INITIATOR[ stateDir] = " $OSYNC_DIR / $state_dir "
INITIATOR[ backupDir] = " $OSYNC_DIR / $backup_dir "
INITIATOR[ deleteDir] = " $OSYNC_DIR / $delete_dir "
INITIATOR[ partialDir] = " $OSYNC_DIR / $partial_dir "
INITIATOR[ initiatorLastActionFile] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir /initiator- $last_action - $INSTANCE_ID $dry_suffix "
INITIATOR[ targetLastActionFile] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir /target- $last_action - $INSTANCE_ID $dry_suffix "
INITIATOR[ resumeCount] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir / $resume_count - $INSTANCE_ID $dry_suffix "
INITIATOR[ treeCurrentFile] = " -tree-current- $INSTANCE_ID $dry_suffix "
INITIATOR[ treeAfterFile] = " -tree-after- $INSTANCE_ID $dry_suffix "
INITIATOR[ treeAfterFileNoSuffix] = " -tree-after- $INSTANCE_ID "
INITIATOR[ deletedListFile] = " -deleted-list- $INSTANCE_ID $dry_suffix "
INITIATOR[ failedDeletedListFile] = " -failed-delete- $INSTANCE_ID $dry_suffix "
declare -gA TARGET
TARGET[ type] = 'target'
TARGET[ replicaDir] = " $TARGET_SYNC_DIR "
TARGET[ lockFile] = " $TARGET_SYNC_DIR $OSYNC_DIR / $lock_filename "
TARGET[ stateDir] = " $OSYNC_DIR / $state_dir "
TARGET[ backupDir] = " $OSYNC_DIR / $backup_dir "
TARGET[ deleteDir] = " $OSYNC_DIR / $delete_dir "
PARTIAL_DIR = " ${ INITIATOR [partialDir] } "
# The following associative like array definitions are used for bash ver < 4 compat
readonly __type = 0
readonly __replicaDir = 1
readonly __lockFile = 2
readonly __stateDir = 3
readonly __backupDir = 4
readonly __deleteDir = 5
readonly __partialDir = 6
readonly __initiatorLastActionFile = 7
readonly __targetLastActionFile = 8
readonly __resumeCount = 9
readonly __treeCurrentFile = 10
readonly __treeAfterFile = 11
readonly __treeAfterFileNoSuffix = 12
readonly __deletedListfile = 13
readonly __failedDeletedListFile = 14
INITIATOR = ( )
INITIATOR[ $__type ] = 'initiator'
INITIATOR[ $__replicaDir ] = " $INITIATOR_SYNC_DIR "
INITIATOR[ $__lockFile ] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $lock_filename "
INITIATOR[ $__stateDir ] = " $OSYNC_DIR / $state_dir "
INITIATOR[ $__backupDir ] = " $OSYNC_DIR / $backup_dir "
INITIATOR[ $__deleteDir ] = " $OSYNC_DIR / $delete_dir "
INITIATOR[ $__partialDir ] = " $OSYNC_DIR / $partial_dir "
INITIATOR[ $__initiatorLastActionFile ] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir /initiator- $last_action - $INSTANCE_ID $dry_suffix "
INITIATOR[ $__targetLastActionFile ] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir /target- $last_action - $INSTANCE_ID $dry_suffix "
INITIATOR[ $__resumeCount ] = " $INITIATOR_SYNC_DIR $OSYNC_DIR / $state_dir / $resume_count - $INSTANCE_ID $dry_suffix "
INITIATOR[ $__treeCurrentFile ] = " -tree-current- $INSTANCE_ID $dry_suffix "
INITIATOR[ $__treeAfterFile ] = " -tree-after- $INSTANCE_ID $dry_suffix "
INITIATOR[ $__treeAfterFileNoSuffix ] = " -tree-after- $INSTANCE_ID "
INITIATOR[ $__deletedListFile ] = " -deleted-list- $INSTANCE_ID $dry_suffix "
INITIATOR[ $__failedDeletedListFile ] = " -failed-delete- $INSTANCE_ID $dry_suffix "
TARGET = ( )
TARGET[ $__type ] = 'target'
TARGET[ $__replicaDir ] = " $TARGET_SYNC_DIR "
TARGET[ $__lockFile ] = " $TARGET_SYNC_DIR $OSYNC_DIR / $lock_filename "
TARGET[ $__stateDir ] = " $OSYNC_DIR / $state_dir "
TARGET[ $__backupDir ] = " $OSYNC_DIR / $backup_dir "
TARGET[ $__deleteDir ] = " $OSYNC_DIR / $delete_dir "
PARTIAL_DIR = " ${ INITIATOR [ $__partialDir ] } "
## Set sync only function arguments for rsync
SYNC_OPTS = "-u"
@ -3177,8 +3194,8 @@ function Init {
## Conflict options
if [ " $CONFLICT_BACKUP " != "no" ] ; then
INITIATOR_BACKUP = " --backup --backup-dir=\" ${ INITIATOR [ replicaDir]} ${ INITIATOR [ backupDir]} \" "
TARGET_BACKUP = " --backup --backup-dir=\" ${ TARGET [ replicaDir]} ${ TARGET [ backupDir]} \" "
INITIATOR_BACKUP = " --backup --backup-dir=\" ${ INITIATOR [ $__ } ${ INITIATOR [ $__ } \" "
TARGET_BACKUP = " --backup --backup-dir=\" ${ TARGET [ $__ } ${ TARGET [ $__ } \" "
if [ " $CONFLICT_BACKUP_MULTIPLE " = = "yes" ] ; then
INITIATOR_BACKUP = " $INITIATOR_BACKUP --suffix . $( date +%Y.%m.%d-%H.%M.%S) "
TARGET_BACKUP = " $TARGET_BACKUP --suffix . $( date +%Y.%m.%d-%H.%M.%S) "
deajan
8 years ago