Commit 1c9075a1 authored by Alain Takoudjou's avatar Alain Takoudjou

slaprunner resilience: do not exit with error if a backup folder doesn't exists

parent 321734be
...@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56 ...@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
md5sum = e033845c9c24e4bb20caeedf19f9628a md5sum = 860bcf6026750b677992eefb6015eec2
[instance-runner-import] [instance-runner-import]
filename = instance-runner-import.cfg.in filename = instance-runner-import.cfg.in
...@@ -30,7 +30,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3 ...@@ -30,7 +30,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3
[template-runner-export-script] [template-runner-export-script]
filename = template/runner-export.sh.jinja2 filename = template/runner-export.sh.jinja2
md5sum = 98ce179badc6af5979a64a7c3d0a2ceb md5sum = 01c29c4686185d7beb5bf8cffbaa4237
[instance-runner-export] [instance-runner-export]
filename = instance-runner-export.cfg.in filename = instance-runner-export.cfg.in
......
...@@ -81,9 +81,9 @@ EOF ...@@ -81,9 +81,9 @@ EOF
echo "$exclude" |rsync --exclude-from=- instance "$backup_path" echo "$exclude" |rsync --exclude-from=- instance "$backup_path"
fi fi
test -d project && rsync project "$backup_path" (test -d project && rsync project "$backup_path") || true
test -d public && rsync public "$backup_path" (test -d public && rsync public "$backup_path") || true
test -f proxy.db && rsync proxy.db "$backup_path" (test -f proxy.db && rsync proxy.db "$backup_path") || true
) )
# We sync .* appart # We sync .* appart
( (
......
...@@ -94,9 +94,9 @@ EOF ...@@ -94,9 +94,9 @@ EOF
echo "$exclude" |rsync --exclude-from=- instance "$path" echo "$exclude" |rsync --exclude-from=- instance "$path"
fi fi
test -d project && rsync project "$path" (test -d project && rsync project "$path") || true
test -d public && rsync public "$path" (test -d public && rsync public "$path") || true
test -f proxy.db && rsync proxy.db "$path" (test -f proxy.db && rsync proxy.db "$path") || true
) )
log_message "Restoring WebRunner config (etc directory)..." log_message "Restoring WebRunner config (etc directory)..."
......
  • I think with this commit you are also hiding rsync issues. For exemple, rsync could crash because there is some file it cannot read in these paths (ie: root manual intervention). Also, project and public folders are created by the slapos recipe (https://lab.nexedi.com/nexedi/slapos/blob/master/software/slaprunner/instance-runner.cfg#L121-122), so they havo to be there (if not, they will be recreated by the next run of slapos node instance, in order to put back the instance in a consistent state).

  • @Nicolas seems right, the error will make things exit and hide the errors. (it is like make a try...except without catch a specific exception).

    Edited by Rafael Monnerat
  • yes, you are right. I'll commit a fix for it.

  • mentioned in commit 01d58b18

    Toggle commit list
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment