Invalidate create_pid if create process has died.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index a233c11f7060c0321502c35e555df78ef0b3931b..c45f4506ec210643d96b67cfc9d63967afa8593d 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) {
@@ -252,8 +250,7 @@ static int pre_remove_hook(struct snapshot *s, const char *why)
        cmd = make_message("%s %s/%s", conf.pre_remove_hook_arg,
                conf.dest_dir_arg, s->name);
        DSS_DEBUG_LOG("executing %s\n", cmd);
-       ret = dss_exec_cmdline_pid(&remove_pid,
-               conf.pre_remove_hook_arg, fds);
+       ret = dss_exec_cmdline_pid(&remove_pid, cmd, fds);
        free(cmd);
        if (ret < 0)
                return ret;
@@ -506,6 +503,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;
        }
@@ -555,6 +553,7 @@ static void stop_create_process(void)
 {
        if (!create_pid || create_process_stopped)
                return;
+       DSS_INFO_LOG("suspending create process %d\n", (int)create_pid);
        kill(SIGSTOP, create_pid);
        create_process_stopped = 1;
 }
@@ -563,6 +562,7 @@ static void restart_create_process(void)
 {
        if (!create_pid || !create_process_stopped)
                return;
+       DSS_INFO_LOG("resuming create process %d\n", (int)create_pid);
        kill (SIGCONT, create_pid);
        create_process_stopped = 0;
 }
@@ -734,7 +734,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 +765,6 @@ static int handle_pre_create_hook_exit(int status)
        snapshot_creation_status = HS_PRE_SUCCESS;
        ret = 1;
 out:
-       create_pid = 0;
        return ret;
 }
 
@@ -781,17 +779,22 @@ static int handle_sigchld(void)
        if (pid == create_pid) {
                switch (snapshot_creation_status) {
                case HS_PRE_RUNNING:
-                       return handle_pre_create_hook_exit(status);
+                       ret = handle_pre_create_hook_exit(status);
+                       break;
                case HS_RUNNING:
-                       return handle_rsync_exit(status);
+                       ret = handle_rsync_exit(status);
+                       break;
                case HS_POST_RUNNING:
                        snapshot_creation_status = HS_READY;
-                       return 1;
+                       ret = 1;
+                       break;
                default:
                        DSS_EMERG_LOG("BUG: create can't die in status %d\n",
                                snapshot_creation_status);
                        return -E_BUG;
                }
+               create_pid = 0;
+               return ret;
        }
        if (pid == remove_pid) {
                ret = handle_remove_exit(status);
@@ -888,7 +891,6 @@ static int parse_config_file(int override)
                log_welcome(conf.loglevel_arg);
        }
        DSS_DEBUG_LOG("loglevel: %d\n", conf.loglevel_arg);
-//     cmdline_parser_dump(logfile? logfile : stdout, &conf);
        ret = config_file_exists;
 out:
        free(config_file);
@@ -903,14 +905,24 @@ static int change_to_dest_dir(void)
        return dss_chdir(conf.dest_dir_arg);
 }
 
+static void dump_dss_config(const char *msg)
+{
+       if (conf.loglevel_arg > INFO)
+               return;
+       DSS_INFO_LOG("%s\n", msg);
+       cmdline_parser_dump(logfile? logfile : stderr, &conf);
+}
+
 static int handle_sighup(void)
 {
        int ret;
 
-       DSS_NOTICE_LOG("SIGHUP\n");
+       DSS_NOTICE_LOG("SIGHUP, re-reading config\n");
+       dump_dss_config("current config");
        ret = parse_config_file(1);
        if (ret < 0)
                return ret;
+       dump_dss_config("new config");
        invalidate_next_snapshot_time();
        return change_to_dest_dir();
 }
@@ -958,6 +970,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;
@@ -1010,11 +1048,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;
@@ -1086,10 +1123,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;
@@ -1315,6 +1356,7 @@ int main(int argc, char **argv)
        }
        if (conf.daemon_given)
                daemon_init();
+       dump_dss_config("dss configuration");
        ret = change_to_dest_dir();
        if (ret < 0)
                goto out;