Reuse old rsync argv if rsync has to be restarted.
authorAndre Noll <maan@systemlinux.org>
Thu, 25 Mar 2010 13:49:47 +0000 (14:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 25 Mar 2010 13:49:47 +0000 (14:49 +0100)
If rsync must be restarted due to an exit code of 12 or 13,
create_rsync_argv() was called even if the old rsync_argv should
be reused in this case. This (correctly) triggers the assertion

assert(!name_of_reference_snapshot);

in create_rsync_argv(). Fix this by not calling create_rsync_argv()
if there is a reference snapshot.

dss.c

diff --git a/dss.c b/dss.c
index 347268e..68efc2b 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1118,8 +1118,10 @@ static int select_loop(void)
                case HS_POST_RUNNING:
                        continue;
                case HS_PRE_SUCCESS:
-                       free_rsync_argv(rsync_argv);
-                       create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
+                       if (!name_of_reference_snapshot) {
+                               free_rsync_argv(rsync_argv);
+                               create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
+                       }
                        /* fall through */
                case HS_NEEDS_RESTART:
                        if (!next_snapshot_is_due())