|
|
|
@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
|
|
|
|
|
AUTHOR="(C) 2013-2020 by Orsiris de Jong"
|
|
|
|
|
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
|
|
|
|
PROGRAM_VERSION=1.3.0-prerc1
|
|
|
|
|
PROGRAM_BUILD=2020012301
|
|
|
|
|
PROGRAM_BUILD=2020012302
|
|
|
|
|
IS_STABLE=false
|
|
|
|
|
|
|
|
|
|
CONFIG_FILE_REVISION_REQUIRED=1.3.0
|
|
|
|
@ -42,8 +42,8 @@ CONFIG_FILE_REVISION_REQUIRED=1.3.0
|
|
|
|
|
# UnlockReplicas yes #__WITH_PARANOIA_DEBUG
|
|
|
|
|
# CleanUp no #__WITH_PARANOIA_DEBUG
|
|
|
|
|
|
|
|
|
|
_OFUNCTIONS_VERSION=2.3.0-RC3
|
|
|
|
|
_OFUNCTIONS_BUILD=2019122501
|
|
|
|
|
_OFUNCTIONS_VERSION=2.3.0-RC4
|
|
|
|
|
_OFUNCTIONS_BUILD=2020031502
|
|
|
|
|
_OFUNCTIONS_BOOTSTRAP=true
|
|
|
|
|
|
|
|
|
|
if ! type "$BASH" > /dev/null; then
|
|
|
|
@ -419,6 +419,25 @@ function KillAllChilds {
|
|
|
|
|
return $errorcount
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function GenericTrapQuit {
|
|
|
|
|
local exitcode=0
|
|
|
|
|
|
|
|
|
|
# Get ERROR / WARN alert flags from subprocesses that call Logger
|
|
|
|
|
if [ -f "$RUN_DIR/$PROGRAM.Logger.warn.$SCRIPT_PID.$TSTAMP" ]; then
|
|
|
|
|
WARN_ALERT=true
|
|
|
|
|
exitcode=2
|
|
|
|
|
fi
|
|
|
|
|
if [ -f "$RUN_DIR/$PROGRAM.Logger.error.$SCRIPT_PID.$TSTAMP" ]; then
|
|
|
|
|
ERROR_ALERT=true
|
|
|
|
|
exitcode=1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
CleanUp
|
|
|
|
|
exit $exitcode
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#### TrapQuit SUBSET END ####
|
|
|
|
|
|
|
|
|
|
function CleanUp {
|
|
|
|
|
# Exit controlmaster before it's socket gets deleted
|
|
|
|
|
if [ "$SSH_CONTROLMASTER" == true ] && [ "$SSH_CMD" != "" ]; then
|
|
|
|
@ -438,23 +457,6 @@ function CleanUp {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function GenericTrapQuit {
|
|
|
|
|
local exitcode=0
|
|
|
|
|
|
|
|
|
|
# Get ERROR / WARN alert flags from subprocesses that call Logger
|
|
|
|
|
if [ -f "$RUN_DIR/$PROGRAM.Logger.warn.$SCRIPT_PID.$TSTAMP" ]; then
|
|
|
|
|
WARN_ALERT=true
|
|
|
|
|
exitcode=2
|
|
|
|
|
fi
|
|
|
|
|
if [ -f "$RUN_DIR/$PROGRAM.Logger.error.$SCRIPT_PID.$TSTAMP" ]; then
|
|
|
|
|
ERROR_ALERT=true
|
|
|
|
|
exitcode=1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
CleanUp
|
|
|
|
|
exit $exitcode
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# osync/obackup/pmocr script specific mail alert function, use SendEmail function for generic mail sending
|
|
|
|
|
function SendAlert {
|
|
|
|
@ -4423,6 +4425,7 @@ $SSH_CMD env _REMOTE_TOKEN="$_REMOTE_TOKEN" \
|
|
|
|
|
env _DEBUG="'$_DEBUG'" env _PARANOIA_DEBUG="'$_PARANOIA_DEBUG'" env _LOGGER_SILENT="'$_LOGGER_SILENT'" env _LOGGER_VERBOSE="'$_LOGGER_VERBOSE'" env _LOGGER_PREFIX="'$_LOGGER_PREFIX'" env _LOGGER_ERR_ONLY="'$_LOGGER_ERR_ONLY'" \
|
|
|
|
|
env _REMOTE_EXECUTION="true" env PROGRAM="'$PROGRAM'" env SCRIPT_PID="'$SCRIPT_PID'" env TSTAMP="'$TSTAMP'" \
|
|
|
|
|
env _DRYRUN="'$_DRYRUN'" \
|
|
|
|
|
env LOCAL_OS="$REMOTE_OS" \
|
|
|
|
|
env FILE_LIST="'${TARGET[$__replicaDir]}${TARGET[$__stateDir]}/$deletionListFromReplica${INITIATOR[$__deletedListFile]}'" env REPLICA_DIR="'$replicaDir'" env SOFT_DELETE="'$SOFT_DELETE'" \
|
|
|
|
|
env DELETION_DIR="'$(EscapeSpaces "$deletionDir")'" env FAILED_DELETE_LIST="'$failedDeleteList'" env SUCCESS_DELETE_LIST="'$successDeleteList'" env REPLICA_TYPE="'$replicaType'" \
|
|
|
|
|
env LC_ALL=C $COMMAND_SUDO' bash -s' << 'ENDSSH' >> "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID.$TSTAMP" 2>&1
|
|
|
|
|