X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=12ad11cfdfc22e9707cb340a291785bfbfc2bf87;hp=86e83827f50991fc9460eb44c71b45211b7fc1a8;hb=df4a2d392aa10cc73e66fedc24a4e3703ec5335e;hpb=cfdc28028a7a55a1f9e14ff3d2e34273ef32e6a6 diff --git a/dss.c b/dss.c index 86e8382..12ad11c 100644 --- a/dss.c +++ b/dss.c @@ -40,24 +40,22 @@ static struct gengetopt_args_info conf; static FILE *logfile; /** The read end of the signal pipe */ static int signal_pipe; -/** Process id of current rsync process. */ -static pid_t rsync_pid; -/** Whether the rsync process is currently stopped */ -static int rsync_stopped; -/** Process id of current rm process. */ -static pid_t rm_pid; +/** Process id of current pre-create-hook/rsync/post-create-hook process. */ +static pid_t create_pid; +/** Whether the pre-create-hook/rsync/post-create-hook is currently stopped. */ +static int create_process_stopped; +/** Process id of current pre-remove/rm/post-remove process. */ +static pid_t remove_pid; /** When the next snapshot is due. */ static struct timeval next_snapshot_time; -/** The pid of the pre-create hook. */ -static pid_t pre_create_hook_pid; -/** The pid of the post-create hook. */ -static pid_t post_create_hook_pid; /** Creation time of the snapshot currently being created. */ static int64_t current_snapshot_creation_time; /** Needed by the post-create hook. */ static char *path_to_last_complete_snapshot; /** \sa \ref snap.h for details. */ -static unsigned snapshot_creation_status; +enum hook_status snapshot_creation_status; +/** \sa \ref snap.h for details. */ +enum hook_status snapshot_removal_status; DEFINE_DSS_ERRLIST; @@ -159,7 +157,7 @@ static void compute_next_snapshot_time(void) struct snapshot *s = NULL; struct snapshot_list sl; - assert(snapshot_creation_status == SCS_READY); + assert(snapshot_creation_status == HS_READY); current_snapshot_creation_time = 0; dss_get_snapshot_list(&sl); FOR_EACH_SNAPSHOT(s, i, &sl) { @@ -175,13 +173,13 @@ static void compute_next_snapshot_time(void) tmp.tv_sec = x; tmp.tv_usec = 0; ret = tv_diff(&unit_interval, &tmp, &diff); /* total sleep time per unit interval */ - gettimeofday(&now, NULL); - if (ret < 0 || !s) + if (ret < 0 || !s) /* unit_interval < tmp or no snapshot */ goto min_sleep; tv_divide(wanted, &diff, &tmp); /* sleep time betweeen two snapshots */ - diff.tv_sec = s->completion_time; + diff.tv_sec = s->completion_time; /* completion time of the the latest snaphot */ diff.tv_usec = 0; tv_add(&diff, &tmp, &next_snapshot_time); + gettimeofday(&now, NULL); if (tv_diff(&now, &next_snapshot_time, NULL) < 0) goto out; min_sleep: @@ -192,23 +190,29 @@ out: } -static int remove_snapshot(struct snapshot *s) +static int remove_snapshot(struct snapshot *s, char *why) { int fds[3] = {0, 0, 0}; - assert(!rm_pid); + assert(!remove_pid); char *new_name = being_deleted_name(s); int ret = dss_rename(s->name, new_name); char *argv[] = {"rm", "-rf", new_name, NULL}; if (ret < 0) goto out; - DSS_NOTICE_LOG("removing %s (interval = %i)\n", s->name, s->interval); - ret = dss_exec(&rm_pid, argv[0], argv, fds); + DSS_NOTICE_LOG("removing %s snapshot %s (interval = %i)\n", + why, s->name, s->interval); + ret = dss_exec(&remove_pid, argv[0], argv, fds); out: free(new_name); return ret; } +static int snapshot_is_being_created(struct snapshot *s) +{ + return s->creation_time == current_snapshot_creation_time; +} + /* * return: 0: no redundant snapshots, 1: rm process started, negative: error */ @@ -235,6 +239,8 @@ static int remove_redundant_snapshot(struct snapshot_list *sl) FOR_EACH_SNAPSHOT(s, i, sl) { int64_t this_score; + if (snapshot_is_being_created(s)) + continue; //DSS_DEBUG_LOG("checking %s\n", s->name); if (s->interval > interval) { prev = s; @@ -264,7 +270,7 @@ static int remove_redundant_snapshot(struct snapshot_list *sl) victim->name, victim->interval); continue; } - ret = remove_snapshot(victim); + ret = remove_snapshot(victim, "redundant"); return ret < 0? ret : 1; } return 0; @@ -278,6 +284,8 @@ static int remove_outdated_snapshot(struct snapshot_list *sl) DSS_DEBUG_LOG("looking for snapshots belonging to intervals greater than %d\n", conf.num_intervals_arg); FOR_EACH_SNAPSHOT(s, i, sl) { + if (snapshot_is_being_created(s)) + continue; if (s->interval <= conf.num_intervals_arg) continue; if (conf.dry_run_given) { @@ -285,7 +293,7 @@ static int remove_outdated_snapshot(struct snapshot_list *sl) s->name, s->interval); continue; } - ret = remove_snapshot(s); + ret = remove_snapshot(s, "outdated"); if (ret < 0) return ret; return 1; @@ -300,9 +308,9 @@ static int remove_oldest_snapshot(struct snapshot_list *sl) if (!s) /* no snapshot found */ return 0; DSS_INFO_LOG("oldest snapshot: %s\n", s->name); - if (s->creation_time == current_snapshot_creation_time) - return 0; /* do not remove the snapshot currently being created */ - return remove_snapshot(s); + if (snapshot_is_being_created(s)) + return 0; + return remove_snapshot(s, "oldest"); } static int rename_incomplete_snapshot(int64_t start) @@ -358,15 +366,15 @@ static int pre_create_hook(void) int ret, fds[3] = {0, 0, 0}; if (!conf.pre_create_hook_given) { - snapshot_creation_status = SCS_PRE_HOOK_SUCCESS; + snapshot_creation_status = HS_PRE_SUCCESS; return 0; } - DSS_NOTICE_LOG("executing %s\n", conf.pre_create_hook_arg); - ret = dss_exec_cmdline_pid(&pre_create_hook_pid, + DSS_DEBUG_LOG("executing %s\n", conf.pre_create_hook_arg); + ret = dss_exec_cmdline_pid(&create_pid, conf.pre_create_hook_arg, fds); if (ret < 0) return ret; - snapshot_creation_status = SCS_PRE_HOOK_RUNNING; + snapshot_creation_status = HS_PRE_RUNNING; return ret; } @@ -376,18 +384,18 @@ static int post_create_hook(void) char *cmd; if (!conf.post_create_hook_given) { - snapshot_creation_status = SCS_READY; + snapshot_creation_status = HS_READY; compute_next_snapshot_time(); return 0; } - cmd = make_message("%s %s", conf.post_create_hook_arg, - path_to_last_complete_snapshot); + cmd = make_message("%s %s/%s", conf.post_create_hook_arg, + conf.dest_dir_arg, path_to_last_complete_snapshot); DSS_NOTICE_LOG("executing %s\n", cmd); - ret = dss_exec_cmdline_pid(&post_create_hook_pid, cmd, fds); + ret = dss_exec_cmdline_pid(&create_pid, cmd, fds); free(cmd); if (ret < 0) return ret; - snapshot_creation_status = SCS_POST_HOOK_RUNNING; + snapshot_creation_status = HS_POST_RUNNING; return ret; } @@ -399,23 +407,22 @@ static void kill_process(pid_t pid) kill(pid, SIGTERM); } -static void stop_rsync_process(void) +static void stop_create_process(void) { - if (!rsync_pid || rsync_stopped) + if (!create_pid || create_process_stopped) return; - kill(SIGSTOP, rsync_pid); - rsync_stopped = 1; + kill(SIGSTOP, create_pid); + create_process_stopped = 1; } -static void restart_rsync_process(void) +static void restart_create_process(void) { - if (!rsync_pid || !rsync_stopped) + if (!create_pid || !create_process_stopped) return; - kill (SIGCONT, rsync_pid); - rsync_stopped = 0; + kill (SIGCONT, create_pid); + create_process_stopped = 0; } - /** * Print a log message about the exit status of a child. */ @@ -469,7 +476,7 @@ static int wait_for_process(pid_t pid, int *status) static int handle_rm_exit(int status) { - rm_pid = 0; + remove_pid = 0; if (!WIFEXITED(status)) return -E_INVOLUNTARY_EXIT; if (WEXITSTATUS(status)) @@ -479,7 +486,7 @@ static int handle_rm_exit(int status) static int wait_for_rm_process(void) { - int status, ret = wait_for_process(rm_pid, &status); + int status, ret = wait_for_process(remove_pid, &status); if (ret < 0) return ret; @@ -491,58 +498,68 @@ static int handle_rsync_exit(int status) int es, ret; if (!WIFEXITED(status)) { - DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)rsync_pid); + DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)create_pid); ret = -E_INVOLUNTARY_EXIT; - snapshot_creation_status = SCS_READY; + snapshot_creation_status = HS_READY; compute_next_snapshot_time(); goto out; } es = WEXITSTATUS(status); if (es == 13) { /* Errors with program diagnostics */ DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n", - (int)rsync_pid, es); - snapshot_creation_status = SCS_RSYNC_NEEDS_RESTART; + (int)create_pid, es); + snapshot_creation_status = HS_NEEDS_RESTART; + gettimeofday(&next_snapshot_time, NULL); + next_snapshot_time.tv_sec += 60; ret = 1; goto out; } if (es != 0 && es != 23 && es != 24) { - DSS_ERROR_LOG("rsync process %d returned %d\n", (int)rsync_pid, es); + DSS_ERROR_LOG("rsync process %d returned %d\n", (int)create_pid, es); ret = -E_BAD_EXIT_CODE; - snapshot_creation_status = SCS_READY; + snapshot_creation_status = HS_READY; compute_next_snapshot_time(); goto out; } ret = rename_incomplete_snapshot(current_snapshot_creation_time); if (ret < 0) goto out; - snapshot_creation_status = SCS_RSYNC_SUCCESS; + snapshot_creation_status = HS_SUCCESS; out: - rsync_pid = 0; - rsync_stopped = 0; + create_pid = 0; + create_process_stopped = 0; return ret; } static int handle_pre_create_hook_exit(int status) { int es, ret; + static int warn_count; if (!WIFEXITED(status)) { - snapshot_creation_status = SCS_READY; + snapshot_creation_status = HS_READY; compute_next_snapshot_time(); ret = -E_INVOLUNTARY_EXIT; goto out; } es = WEXITSTATUS(status); if (es) { - snapshot_creation_status = SCS_READY; + if (!warn_count--) { + DSS_NOTICE_LOG("pre_create_hook %s returned %d\n", + conf.pre_create_hook_arg, es); + DSS_NOTICE_LOG("deferring snapshot creation...\n"); + warn_count = 60; /* warn only once per hour */ + } + snapshot_creation_status = HS_READY; compute_next_snapshot_time(); - ret = -E_BAD_EXIT_CODE; + ret = 0; goto out; } - snapshot_creation_status = SCS_PRE_HOOK_SUCCESS; + warn_count = 0; + snapshot_creation_status = HS_PRE_SUCCESS; ret = 1; out: - pre_create_hook_pid = 0; + create_pid = 0; return ret; } @@ -553,17 +570,25 @@ static int handle_sigchld(void) if (ret <= 0) return ret; - if (pid == rsync_pid) - return handle_rsync_exit(status); - if (pid == rm_pid) - return handle_rm_exit(status); - if (pid == pre_create_hook_pid) - return handle_pre_create_hook_exit(status); - if (pid == post_create_hook_pid) { - snapshot_creation_status = SCS_READY; - compute_next_snapshot_time(); - return 1; + + if (pid == create_pid) { + switch (snapshot_creation_status) { + case HS_PRE_RUNNING: + return handle_pre_create_hook_exit(status); + case HS_RUNNING: + return handle_rsync_exit(status); + case HS_POST_RUNNING: + snapshot_creation_status = HS_READY; + compute_next_snapshot_time(); + return 1; + default: + DSS_EMERG_LOG("BUG: create can't die in status %d\n", + snapshot_creation_status); + return -E_BUG; + } } + if (pid == remove_pid) + return handle_rm_exit(status); DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid); return -E_BUG; } @@ -618,6 +643,15 @@ static int parse_config_file(int override) .check_ambiguity = 0, .print_errors = 1 }; + if (override) { /* invalidate all rsync options */ + int i; + + for (i = 0; i < conf.rsync_option_given; i++) { + free(conf.rsync_option_arg[i]); + conf.rsync_option_arg[i] = NULL; + } + conf.rsync_option_given = 0; + } cmdline_parser_config_file(config_file, &conf, ¶ms); } ret = check_config(); @@ -675,9 +709,9 @@ static int handle_signal(void) switch (sig) { case SIGINT: case SIGTERM: - restart_rsync_process(); - kill_process(rsync_pid); - kill_process(rm_pid); + restart_create_process(); + kill_process(create_pid); + kill_process(remove_pid); ret = -E_SIGNAL; break; case SIGHUP: @@ -693,6 +727,21 @@ out: return ret; } +/* + * We can not use rsync locally if the local user is different from the remote + * user or if the src dir is not on the local host (or both). + */ +static int use_rsync_locally(char *logname) +{ + char *h = conf.remote_host_arg; + + if (strcmp(h, "localhost") && strcmp(h, "127.0.0.1")) + return 0; + if (conf.remote_user_given && strcmp(conf.remote_user_arg, logname)) + return 0; + return 1; +} + static void create_rsync_argv(char ***argv, int64_t *num) { char *logname, *newest; @@ -716,7 +765,7 @@ static void create_rsync_argv(char ***argv, int64_t *num) } else DSS_INFO_LOG("no previous snapshot found\n"); logname = dss_logname(); - if (conf.remote_user_given && !strcmp(conf.remote_user_arg, logname)) + if (use_rsync_locally(logname)) (*argv)[i++] = dss_strdup(conf.source_dir_arg); else (*argv)[i++] = make_message("%s@%s:%s/", conf.remote_user_given? @@ -749,10 +798,10 @@ static int create_snapshot(char **argv) name = incomplete_name(current_snapshot_creation_time); DSS_NOTICE_LOG("creating new snapshot %s\n", name); free(name); - ret = dss_exec(&rsync_pid, argv[0], argv, fds); + ret = dss_exec(&create_pid, argv[0], argv, fds); if (ret < 0) return ret; - snapshot_creation_status = SCS_RSYNC_RUNNING; + snapshot_creation_status = HS_RUNNING; return ret; } @@ -768,7 +817,7 @@ static int select_loop(void) int low_disk_space; struct timeval now, *tvp; - if (rm_pid) + if (remove_pid) tvp = NULL; /* sleep until rm process dies */ else { /* sleep one minute */ tv.tv_sec = 60; @@ -786,7 +835,7 @@ static int select_loop(void) if (ret < 0) goto out; } - if (rm_pid) + if (remove_pid) continue; ret = disk_space_low(); if (ret < 0) @@ -795,42 +844,42 @@ static int select_loop(void) ret = try_to_free_disk_space(low_disk_space); if (ret < 0) goto out; - if (rm_pid) { - stop_rsync_process(); + if (remove_pid) { + stop_create_process(); continue; } - restart_rsync_process(); + restart_create_process(); gettimeofday(&now, NULL); if (tv_diff(&next_snapshot_time, &now, NULL) > 0) continue; switch (snapshot_creation_status) { - case SCS_READY: + case HS_READY: ret = pre_create_hook(); if (ret < 0) goto out; continue; - case SCS_PRE_HOOK_RUNNING: + case HS_PRE_RUNNING: continue; - case SCS_RSYNC_NEEDS_RESTART: + case HS_NEEDS_RESTART: ret = create_snapshot(rsync_argv); if (ret < 0) goto out; continue; - case SCS_PRE_HOOK_SUCCESS: + case HS_PRE_SUCCESS: free_rsync_argv(rsync_argv); create_rsync_argv(&rsync_argv, ¤t_snapshot_creation_time); ret = create_snapshot(rsync_argv); if (ret < 0) goto out; continue; - case SCS_RSYNC_RUNNING: + case HS_RUNNING: continue; - case SCS_RSYNC_SUCCESS: + case HS_SUCCESS: ret = post_create_hook(); if (ret < 0) goto out; continue; - case SCS_POST_HOOK_RUNNING: + case HS_POST_RUNNING: continue; } } @@ -931,27 +980,27 @@ static int com_create(void) ret = pre_create_hook(); if (ret < 0) return ret; - if (pre_create_hook_pid) { - ret = wait_for_process(pre_create_hook_pid, &status); + if (create_pid) { + ret = wait_for_process(create_pid, &status); if (ret < 0) return ret; ret = handle_pre_create_hook_exit(status); - if (ret < 0) + if (ret <= 0) /* error, or pre-create failed */ return ret; } create_rsync_argv(&rsync_argv, ¤t_snapshot_creation_time); ret = create_snapshot(rsync_argv); if (ret < 0) goto out; - ret = wait_for_process(rsync_pid, &status); + ret = wait_for_process(create_pid, &status); if (ret < 0) goto out; ret = handle_rsync_exit(status); if (ret < 0) goto out; post_create_hook(); - if (post_create_hook_pid) - ret = wait_for_process(post_create_hook_pid, &status); + if (create_pid) + ret = wait_for_process(create_pid, &status); out: free_rsync_argv(rsync_argv); return ret;