{
COMMANDS
DSS_EMERG_LOG("BUG: did not find command handler\n");
- exit(EXIT_FAILURE);
+ return -E_BUG;
}
#undef COMMAND
#undef COMMANDS
va_end(argp);
}
-/* TODO: Also consider number of inodes. */
static int disk_space_low(void)
{
struct disk_space ds;
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 */
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;
return 1;
}
DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid);
- exit(EXIT_FAILURE);
+ return -E_BUG;
}
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;
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);
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 change_to_dest_dir(void)
+static int change_to_dest_dir(void)
{
- int ret;
-
DSS_INFO_LOG("changing cwd to %s\n", conf.dest_dir_arg);
- ret = dss_chdir(conf.dest_dir_arg);
- if (ret >= 0)
- return;
- DSS_EMERG_LOG("%s\n", dss_strerror(-ret));
- exit(EXIT_FAILURE);
+ return dss_chdir(conf.dest_dir_arg);
}
-static void handle_sighup(void)
+static int handle_sighup(void)
{
+ int ret;
+
DSS_NOTICE_LOG("SIGHUP\n");
- parse_config_file(1);
- change_to_dest_dir();
+ 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();
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();
out:
if (ret < 0)
DSS_ERROR_LOG("%s\n", dss_strerror(-ret));
+ return ret;
}
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);
int ret;
/* 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;
if (rm_pid)
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;
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;
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;
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)
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;
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);
}
/**
};
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();
- change_to_dest_dir();
- 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);
projects / dss.git / blobdiff