X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=86e83827f50991fc9460eb44c71b45211b7fc1a8;hp=02d0c8bd5d9e1cc5ef3c5051088a8c99bbe60021;hb=ee3cd16153a02196718951bd9c562b6fa2cf15dd;hpb=e83760cba6aba516c3de4bb4ef4df9fa4020ccfa diff --git a/dss.c b/dss.c index 02d0c8b..86e8382 100644 --- a/dss.c +++ b/dss.c @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2008 Andre Noll + * + * Licensed under the GPL v2. For licencing details see COPYING. + */ #include #include #include @@ -72,7 +77,7 @@ static int call_command_handler(void) { COMMANDS DSS_EMERG_LOG("BUG: did not find command handler\n"); - exit(EXIT_FAILURE); + return -E_BUG; } #undef COMMAND #undef COMMANDS @@ -119,7 +124,6 @@ static __printf_1_2 void dss_msg(const char* fmt,...) va_end(argp); } -/* TODO: Also consider number of inodes. */ static int disk_space_low(void) { struct disk_space ds; @@ -214,7 +218,7 @@ static int remove_redundant_snapshot(struct snapshot_list *sl) struct snapshot *s; unsigned missing = 0; - DSS_INFO_LOG("looking for intervals containing too many snapshots\n"); + DSS_DEBUG_LOG("looking for intervals containing too many snapshots\n"); for (interval = conf.num_intervals_arg - 1; interval >= 0; interval--) { unsigned keep = desired_number_of_snapshots(interval, conf.num_intervals_arg); unsigned num = sl->interval_count[interval]; @@ -271,7 +275,7 @@ static int remove_outdated_snapshot(struct snapshot_list *sl) int i, ret; struct snapshot *s; - DSS_INFO_LOG("looking for snapshots belonging to intervals greater than %d\n", + DSS_DEBUG_LOG("looking for snapshots belonging to intervals greater than %d\n", conf.num_intervals_arg); FOR_EACH_SNAPSHOT(s, i, sl) { if (s->interval <= conf.num_intervals_arg) @@ -325,6 +329,8 @@ static int try_to_free_disk_space(int low_disk_space) int ret; struct snapshot_list sl; + if (!low_disk_space && conf.keep_redundant_given) + return 0; dss_get_snapshot_list(&sl); ret = remove_outdated_snapshot(&sl); if (ret) /* error, or we are removing something */ @@ -341,7 +347,7 @@ static int try_to_free_disk_space(int low_disk_space) if (ret) goto out; DSS_CRIT_LOG("uhuhu: not enough disk space for a single snapshot\n"); - ret= -ENOSPC; + ret = -ERRNO_TO_DSS_ERROR(ENOSPC); out: free_snapshot_list(&sl); return ret; @@ -492,6 +498,13 @@ static int handle_rsync_exit(int status) 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; + ret = 1; + goto out; + } if (es != 0 && es != 23 && es != 24) { DSS_ERROR_LOG("rsync process %d returned %d\n", (int)rsync_pid, es); ret = -E_BAD_EXIT_CODE; @@ -552,7 +565,7 @@ static int handle_sigchld(void) return 1; } DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid); - exit(EXIT_FAILURE); + return -E_BUG; } static int check_config(void) @@ -570,8 +583,7 @@ static int check_config(void) return 1; } -/* exits on errors */ -static void parse_config_file(int override) +static int parse_config_file(int override) { int ret; char *config_file; @@ -627,24 +639,33 @@ static void parse_config_file(int override) logfile = open_log(conf.logfile_arg); log_welcome(conf.loglevel_arg); } - DSS_EMERG_LOG("loglevel: %d\n", conf.loglevel_arg); + DSS_DEBUG_LOG("loglevel: %d\n", conf.loglevel_arg); // cmdline_parser_dump(logfile? logfile : stdout, &conf); - ret = dss_chdir(conf.dest_dir_arg); out: free(config_file); - if (ret >= 0) - return; - DSS_EMERG_LOG("%s\n", dss_strerror(-ret)); - exit(EXIT_FAILURE); + if (ret < 0) + DSS_EMERG_LOG("%s\n", dss_strerror(-ret)); + return ret; } -static void handle_sighup(void) +static int change_to_dest_dir(void) { + DSS_INFO_LOG("changing cwd to %s\n", conf.dest_dir_arg); + return dss_chdir(conf.dest_dir_arg); +} + +static int handle_sighup(void) +{ + int ret; + DSS_NOTICE_LOG("SIGHUP\n"); - parse_config_file(1); + ret = parse_config_file(1); + if (ret < 0) + return ret; + return change_to_dest_dir(); } -static void handle_signal(void) +static int handle_signal(void) { int sig, ret = next_signal(); @@ -657,10 +678,10 @@ static void handle_signal(void) restart_rsync_process(); kill_process(rsync_pid); kill_process(rm_pid); - exit(EXIT_FAILURE); + ret = -E_SIGNAL; + break; case SIGHUP: - handle_sighup(); - ret = 1; + ret = handle_sighup(); break; case SIGCHLD: ret = handle_sigchld(); @@ -669,6 +690,7 @@ static void handle_signal(void) out: if (ret < 0) DSS_ERROR_LOG("%s\n", dss_strerror(-ret)); + return ret; } static void create_rsync_argv(char ***argv, int64_t *num) @@ -693,11 +715,6 @@ static void create_rsync_argv(char ***argv, int64_t *num) free(newest); } else DSS_INFO_LOG("no previous snapshot found\n"); - if (conf.exclude_patterns_given) { - (*argv)[i++] = dss_strdup("--exclude-from"); - (*argv)[i++] = dss_strdup(conf.exclude_patterns_arg); - - } logname = dss_logname(); if (conf.remote_user_given && !strcmp(conf.remote_user_arg, logname)) (*argv)[i++] = dss_strdup(conf.source_dir_arg); @@ -716,6 +733,9 @@ static void create_rsync_argv(char ***argv, int64_t *num) static void free_rsync_argv(char **argv) { int i; + + if (!argv) + return; for (i = 0; argv[i]; i++) free(argv[i]); free(argv); @@ -739,42 +759,49 @@ static int create_snapshot(char **argv) static int select_loop(void) { int ret; - struct timeval tv = {.tv_sec = 0, .tv_usec = 0}; + /* check every 60 seconds for free disk space */ + struct timeval tv; + char **rsync_argv = NULL; for (;;) { fd_set rfds; int low_disk_space; - char **rsync_argv; - struct timeval now, *tvp = &tv; + struct timeval now, *tvp; - if (rsync_pid) - tv.tv_sec = 60; /* check every 60 seconds for free disk space */ - else if (rm_pid) + if (rm_pid) tvp = NULL; /* sleep until rm process dies */ + else { /* sleep one minute */ + tv.tv_sec = 60; + tv.tv_usec = 0; + tvp = &tv; + } FD_ZERO(&rfds); FD_SET(signal_pipe, &rfds); - DSS_DEBUG_LOG("tvp: %p, tv_sec: %lu\n", tvp, (long unsigned) tv.tv_sec); + DSS_DEBUG_LOG("tvp: %p, tv_sec : %lu\n", tvp, (long unsigned) tv.tv_sec); ret = dss_select(signal_pipe + 1, &rfds, NULL, tvp); if (ret < 0) - return ret; - if (FD_ISSET(signal_pipe, &rfds)) - handle_signal(); + goto out; + if (FD_ISSET(signal_pipe, &rfds)) { + ret = handle_signal(); + if (ret < 0) + goto out; + } if (rm_pid) continue; ret = disk_space_low(); if (ret < 0) - break; + goto out; low_disk_space = ret; ret = try_to_free_disk_space(low_disk_space); if (ret < 0) - break; + goto out; if (rm_pid) { stop_rsync_process(); continue; } restart_rsync_process(); gettimeofday(&now, NULL); - if (tv_diff(&next_snapshot_time, &now, &tv) > 0) + if (tv_diff(&next_snapshot_time, &now, NULL) > 0) continue; switch (snapshot_creation_status) { case SCS_READY: @@ -784,10 +811,15 @@ static int select_loop(void) continue; case SCS_PRE_HOOK_RUNNING: continue; + case SCS_RSYNC_NEEDS_RESTART: + ret = create_snapshot(rsync_argv); + if (ret < 0) + goto out; + continue; case SCS_PRE_HOOK_SUCCESS: + free_rsync_argv(rsync_argv); create_rsync_argv(&rsync_argv, ¤t_snapshot_creation_time); ret = create_snapshot(rsync_argv); - free_rsync_argv(rsync_argv); if (ret < 0) goto out; continue; @@ -806,6 +838,18 @@ out: return ret; } +static void exit_hook(int exit_code) +{ + int fds[3] = {0, 0, 0}; + char *argv[] = {conf.exit_hook_arg, dss_strerror(-exit_code), NULL}; + pid_t pid; + + if (!conf.exit_hook_given) + return; + DSS_NOTICE_LOG("executing %s %s\n", argv[0], argv[1]); + dss_exec(&pid, conf.exit_hook_arg, argv, fds); +} + static int com_run(void) { int ret; @@ -818,7 +862,11 @@ static int com_run(void) if (ret < 0) return ret; compute_next_snapshot_time(); - return select_loop(); + ret = select_loop(); + if (ret >= 0) /* impossible */ + ret = -E_BUG; + exit_hook(ret); + return ret; } static int com_prune(void) @@ -916,13 +964,17 @@ static int com_ls(void) struct snapshot *s; dss_get_snapshot_list(&sl); - FOR_EACH_SNAPSHOT(s, i, &sl) - dss_msg("%u\t%s\n", s->interval, s->name); + FOR_EACH_SNAPSHOT(s, i, &sl) { + int64_t d = 0; + if (s->flags & SS_COMPLETE) + d = (s->completion_time - s->creation_time) / 60; + dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval, s->name, d/60, d%60); + }; free_snapshot_list(&sl); return 1; } -static void setup_signal_handling(void) +static int setup_signal_handling(void) { int ret; @@ -930,17 +982,11 @@ static void setup_signal_handling(void) signal_pipe = signal_init(); /* always successful */ ret = install_sighandler(SIGINT); if (ret < 0) - goto err; + return ret; ret = install_sighandler(SIGTERM); if (ret < 0) - goto err; - ret = install_sighandler(SIGCHLD); - if (ret < 0) - goto err; - return; -err: - DSS_EMERG_LOG("could not install signal handlers\n"); - exit(EXIT_FAILURE); + return ret; + return install_sighandler(SIGCHLD); } /** @@ -961,12 +1007,19 @@ int main(int argc, char **argv) }; cmdline_parser_ext(argc, argv, &conf, ¶ms); /* aborts on errors */ - parse_config_file(0); - + ret = parse_config_file(0); + if (ret < 0) + goto out; if (conf.daemon_given) daemon_init(); - setup_signal_handling(); + ret = change_to_dest_dir(); + if (ret < 0) + goto out; + ret = setup_signal_handling(); + if (ret < 0) + goto out; ret = call_command_handler(); +out: if (ret < 0) DSS_EMERG_LOG("%s\n", dss_strerror(-ret)); exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);