Reuse old rsync argv if rsync has to be restarted.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index eae8b3ed0f2ea112a54c3d6356329c9f6e768441..68efc2b07cc457c4944013b6e3147fdc3f2adce1 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -161,7 +161,6 @@ static int64_t compute_next_snapshot_time(void)
        struct snapshot *s = NULL;
        struct snapshot_list sl;
 
-       current_snapshot_creation_time = 0;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {
                if (!(s->flags & SS_COMPLETE))
@@ -197,7 +196,6 @@ static int next_snapshot_is_due(void)
 {
        int64_t now = get_current_time();
 
-       assert(snapshot_creation_status == HS_READY);
        if (!next_snapshot_time_is_valid())
                next_snapshot_time = compute_next_snapshot_time();
        if (next_snapshot_time <= now) {
@@ -506,6 +504,7 @@ static int post_create_hook(void)
        char *cmd;
 
        if (!conf.post_create_hook_given) {
+               create_pid = 0;
                snapshot_creation_status = HS_READY;
                return 0;
        }
@@ -1119,10 +1118,14 @@ 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())
+                               continue;
                        ret = create_snapshot(rsync_argv);
                        if (ret < 0)
                                goto out;