Reuse old rsync argv if rsync has to be restarted.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index c5f636c2ed8b86ad5170c164d3f6e2d4d08d862c..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;
        }
@@ -734,7 +733,6 @@ static int handle_rsync_exit(int status)
        free(name_of_reference_snapshot);
        name_of_reference_snapshot = NULL;
 out:
-       create_pid = 0;
        create_process_stopped = 0;
        return ret;
 }
@@ -766,7 +764,6 @@ static int handle_pre_create_hook_exit(int status)
        snapshot_creation_status = HS_PRE_SUCCESS;
        ret = 1;
 out:
-       create_pid = 0;
        return ret;
 }
 
@@ -792,6 +789,7 @@ static int handle_sigchld(void)
                                snapshot_creation_status);
                        return -E_BUG;
                }
+               create_pid = 0;
        }
        if (pid == remove_pid) {
                ret = handle_remove_exit(status);
@@ -967,6 +965,32 @@ static int use_rsync_locally(char *logname)
        return 1;
 }
 
+static int rename_resume_snap(int64_t creation_time)
+{
+       struct snapshot_list sl = {.num_snapshots = 0};
+       struct snapshot *s;
+       char *new_name = incomplete_name(creation_time);
+       int ret;
+
+       ret = 0;
+       if (conf.no_resume_given)
+               goto out;
+       dss_get_snapshot_list(&sl);
+       s = get_newest_snapshot(&sl);
+       if (!s)
+               goto out;
+       if ((s->flags & SS_COMPLETE) != 0) /* complete */
+               goto out;
+       DSS_INFO_LOG("resuming: reusing %s as destination dir\n", s->name);
+       ret = dss_rename(s->name, new_name);
+out:
+       if (ret >= 0)
+               DSS_NOTICE_LOG("creating new snapshot %s\n", new_name);
+       free(new_name);
+       free_snapshot_list(&sl);
+       return ret;
+}
+
 static void create_rsync_argv(char ***argv, int64_t *num)
 {
        char *logname;
@@ -1019,11 +1043,10 @@ static void free_rsync_argv(char **argv)
 static int create_snapshot(char **argv)
 {
        int ret, fds[3] = {0, 0, 0};
-       char *name;
 
-       name = incomplete_name(current_snapshot_creation_time);
-       DSS_NOTICE_LOG("creating new snapshot %s\n", name);
-       free(name);
+       ret = rename_resume_snap(current_snapshot_creation_time);
+       if (ret < 0)
+               return ret;
        ret = dss_exec(&create_pid, argv[0], argv, fds);
        if (ret < 0)
                return ret;
@@ -1095,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;