From 387d3b7e67e137ee8db966b7596ea41b990569cf Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Wed, 23 Aug 2017 09:38:49 +0200
Subject: [PATCH] slaprunner: Export (rsync) ignore missing args
When a file is removed while rsync is running (after build the list and before transfer the file), rsync fail with the follow message:
rsync warning: some files vanished before they could be transferred
This commit includes --ignore-missing-args into rsync command line to ignore this case, as it is not relevant to the resilience
if a file is removed.
---
software/slaprunner/buildout.hash.cfg | 2 +-
software/slaprunner/template/runner-export.sh.jinja2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg
index 39602515b..13158628f 100644
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -31,7 +31,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
-md5sum = ef87691a9675beb646ae1c99ef69e551
+md5sum = 94c0eddb2af3290942f64e04f95a707c
[instance-runner-export]
filename = instance-runner-export.cfg.in
diff --git a/software/slaprunner/template/runner-export.sh.jinja2 b/software/slaprunner/template/runner-export.sh.jinja2
index 02e3949f1..d41144572 100644
--- a/software/slaprunner/template/runner-export.sh.jinja2
+++ b/software/slaprunner/template/runner-export.sh.jinja2
@@ -20,7 +20,7 @@ tmp_directory='{{ directory["tmp"] }}'
rsync () {
set -x
- '{{ rsync_binary }}' -rlptgov --stats --safe-links --delete --delete-excluded "$@"
+ '{{ rsync_binary }}' -rlptgov --stats --safe-links --ignore-missing-args --delete --delete-excluded "$@"
set +x
}
--
2.30.9