New configuration variable "[default_]io_timeout"

[backup-script.git] / bin / backup-script

diff --git a/bin/backup-script b/bin/backup-script
index 1099f0c73b2bc1d5d7b1b561d2f350d0e4499768..8edf4d1122bdd2b9cffe7ee1580fee0a0724d187 100755 (executable)
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -15,6 +15,7 @@ PIDFILE="/var/run/$NAME.pid"
 
 DRYRUN=0
 VERBOSE=0
+TAG=""
 
 export LC_ALL=C
 
@@ -44,14 +45,17 @@ default_compress=1
 default_ping=1
 default_local=0
 default_generations=0
+default_io_timeout="1800"
 default_job_pre_exec=""
 default_job_post_exec=""
+default_tags=""
 
 Usage() {
        echo "Usage: $NAME [<options>] [<system> [<system> [...]]]"
        echo
-       echo "  -p, --progress    Show progress, see rsync(1)."
-       echo "  -n, --dry-run     Test run only, don't copy any data."
+       echo "  -n, --dry-run       Test run only, don't copy any data."
+       echo "  -p, --progress      Show progress, see rsync(1)."
+       echo "  -t TAG, --tag TAG   Only run jobs with tag TAG."
        echo
        echo "When no <system> is given, all defined systems are used."
        echo
@@ -278,6 +282,7 @@ done
 # Read in configuration file
 config_info="Configuration file is \"$conf\""
 if [ -r "$conf" ]; then
+       # shellcheck source=/dev/null
        source "$conf"
 else
        config_info="${config_info} (not readable, using defaults)"
@@ -292,6 +297,10 @@ while [ $# -gt 0 ]; do
          "-p"|"--progress")
                VERBOSE=1; shift
                ;;
+         "-t"|"--tag")
+               shift; TAG="$1"; shift
+               [ -n "$TAG" ] || Usage
+               ;;
          "-"*)
                Usage
                ;;
@@ -315,6 +324,8 @@ if [ $? -ne 0 ]; then
        exit 1
 fi
 echo "Rsync command is $rsync, protocol version $rsync_proto."
+
+[[ -n "$TAG" ]] && echo "Running jobs tagged with \"$TAG\"."
 echo
 
 trap GotSignal SIGINT
@@ -325,10 +336,10 @@ if [ $# -ge 1 ]; then
                        echo "$NAME: Can' read \"${conf_d}/$s\"!"
                        exit 3
                fi
-               sys="$sys ${conf_d}/$s"
+               sys+=("${conf_d}/$s")
        done
 else
-       sys="${conf_d}/"*
+       sys=("${conf_d}/"*)
 fi
 
 # check and create PID file
@@ -361,7 +372,7 @@ if [ -n "$pre_exec" ]; then
        echo
 fi
 
-for f in $sys; do
+for f in "${sys[@]}"; do
        [[ -r "$f" && -f "$f" ]] || continue
 
        fname=$(basename "$f")
@@ -388,6 +399,8 @@ for f in $sys; do
        generations="$default_generations"
        job_pre_exec="$default_job_pre_exec"
        job_post_exec="$default_job_post_exec"
+       tags="$default_tags"
+       io_timeout="$default_io_timeout"
 
        # Compatibility with backup-pull(1) script: Save global values ...
        pre_exec_saved="$pre_exec"
@@ -400,6 +413,7 @@ for f in $sys; do
        unset post_exec
 
        # Read in system configuration file
+       # shellcheck source=/dev/null
        source "$f"
 
        # Compatibility with backup-pull(1) script: Fix up configuration
@@ -423,12 +437,28 @@ for f in $sys; do
                compress=0
        fi
 
-       # Make sure "source" ends with a slash ("/")
-       case "$source" in
-         "*/")
+       # Add "NONE" tag when no tags are given in the config file:
+       [[ -z "$tags" ]] && tags="NONE"
+       # Add "auto-tags":
+       [[ "$local" -eq 1 ]] && tags="$tags,LOCAL"
+       # Check tags
+       if [[ -n "$TAG" && "$TAG" != "ALL" ]]; then
+               echo "$tags" | grep -E "(^|,)$TAG(,|$)" >/dev/null 2>&1
+               if [ $? -ne 0 ]; then
+                       if [ "$DRYRUN" -ne 0 ]; then
+                               echo "Tags of system \"$system\" don't match \"$TAG\": \"$tags\". Skipped."
+                               echo
+                       fi
+                       continue
+               fi
+       fi
+
+       # Make sure "source_root" ends with a slash ("/")
+       case "$source_root" in
+         *"/")
                ;;
-         "*")
-               source="$source/"
+         *)
+               source_root="$source_root/"
        esac
 
        # Make sure "target" DOESN'T end with a slash ("/")
@@ -543,10 +573,10 @@ for f in $sys; do
 
        # prepare (remote) command ...
        if [[ "$backup_type" == "rsync" ]]; then
-               cmd="$rsync --archive"
+               cmd="$rsync --archive --timeout=$io_timeout"
                [ "$compress" -ne 0 ] && cmd="$cmd --compress"
                [ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
-               cmd="$cmd --delete --delete-excluded --sparse"
+               cmd="$cmd --delete-during --delete-excluded --sparse"
                if [ "$VERBOSE" -gt 0 ]; then
                        [ "$rsync_proto" -ge 31 ] \
                                && cmd="$cmd --info=progress2" \