From 3bf66be267c249bf015d9bab80c21171bf6a4490 Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 26 Nov 2014 11:25:58 +0100 Subject: [PATCH] Final partial-dl upload --- CHANGELOG.md | 4 ++-- osync.sh | 5 +++-- sync.conf | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb875e5..b5d470c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,12 +22,12 @@ UNDER WORK - sync test automation - See if find command could use -delete instead of exec rm (must check compat for BSD and MacOS) -- Partial download is still experimental and needs more testing. Also, need to test if .osync_workdir_partial directory is excluded from file propagations +- Partial download is still experimental and needs more testing. RECENT CHANGES -------------- -- Added a sequential run batch script +- Added a sequential run batch script that can rerun failed batches - Fixed an issue where a failed task never gets resumed after a successfull file replication phase - Added experimental partial downloads support for rsync so big files can be resumed on slow links - Added the ability to keep partial downloads that can be resumed on next run (usefull for big files on slow links that reach max execution time) diff --git a/osync.sh b/osync.sh index cca3fbb..234dd8c 100755 --- a/osync.sh +++ b/osync.sh @@ -3,8 +3,8 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" -PROGRAM_VERSION=0.99RC3+ -PROGRAM_BUILD=2411201403 +PROGRAM_VERSION=0.99RC4 +PROGRAM_BUILD=2611201401 ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode if ! type -p "$BASH" > /dev/null @@ -1803,6 +1803,7 @@ function Init if [ "$PARTIAL" == "yes" ] then SYNC_OPTS=$SYNC_OPTS" --partial --partial-dir=\"$PARTIAL_DIR\"" + RSYNC_EXCLUDE="$RSYNC_EXCLUDE --exclude=\"$PARTIAL_DIR\"" fi ## Conflict options diff --git a/sync.conf b/sync.conf index 77e2e26..7fb41aa 100755 --- a/sync.conf +++ b/sync.conf @@ -2,7 +2,7 @@ ###### Osync - Rsync based two way sync engine with fault tolerance ###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr) -###### Config file rev 1306201401 +###### Config file rev 2411201401 ## ---------- GENERAL OPTIONS @@ -110,8 +110,8 @@ RESUME_TRY=2 ## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be carefull with this option if you have multiple masters. FORCE_STRANGER_LOCK_RESUME=no -## Keep partial uploads that can be resumed on next run -PARTIAL=yes +## Keep partial uploads that can be resumed on next run, experimantal feature +PARTIAL=no ## ---------- ALERT OPTIONS