struct gengetopt_args_info conf;
char *dss_error_txt = NULL;
static FILE *logfile;
-int signal_pipe;
+static int signal_pipe;
/** Process id of current rsync process. */
static pid_t rsync_pid;
* incomplete, being deleted: 1204565370-incomplete.being_deleted
*/
enum snapshot_status_flags {
+ /** The rsync process terminated successfully. */
SS_COMPLETE = 1,
+ /** The rm process is running to remove this snapshot. */
SS_BEING_DELETED = 2,
};
return 1 << n;
}
+/* return: Whether dirname is a snapshot directory (0: no, 1: yes) */
int is_snapshot(const char *dirname, int64_t now, struct snapshot *s)
{
int i, ret;
return 0;
s->completion_time = num;
s->flags = SS_COMPLETE;
- if (strcmp(dot + 1, "being_deleted"))
+ if (!strcmp(dot + 1, "being_deleted"))
s->flags |= SS_BEING_DELETED;
success:
s->name = dss_strdup(dirname);
compare_snapshots);
}
+void free_snapshot_list(struct snapshot_list *sl)
+{
+ int i;
+ struct snapshot *s;
+
+ FOR_EACH_SNAPSHOT(s, i, sl) {
+ free(s->name);
+ free(s);
+ }
+ free(sl->interval_count);
+ sl->interval_count = NULL;
+ free(sl->snapshots);
+ sl->snapshots = NULL;
+ sl->num_snapshots = 0;
+}
+
void stop_rsync_process(void)
{
if (!rsync_pid || rsync_stopped)
rsync_stopped = 0;
}
-void free_snapshot_list(struct snapshot_list *sl)
-{
- int i;
- struct snapshot *s;
-
- FOR_EACH_SNAPSHOT(s, i, sl) {
- free(s->name);
- free(s);
- }
- free(sl->interval_count);
- free(sl->snapshots);
-}
-
/**
* Print a log message about the exit status of a child.
*/
for (;;) {
pause();
ret = next_signal();
- if (ret < 0)
+ if (ret < 0)
break;
if (!ret)
continue;
ret = waitpid(pid, status, 0);
if (ret >= 0)
break;
- if (errno != EINTR) /* error */
+ if (errno != EINTR) { /* error */
+ ret = -ERRNO_TO_DSS_ERROR(errno);
break;
+ }
}
+ /* SIGINT or SIGTERM */
DSS_WARNING_LOG("sending SIGTERM to pid %d\n", (int)pid);
kill(pid, SIGTERM);
}
- if (ret < 0) {
- ret = -ERRNO_TO_DSS_ERROR(errno);
+ if (ret < 0)
make_err_msg("failed to wait for process %d", (int)pid);
- } else
+ else
log_termination_msg(pid, *status);
return ret;
}
free(new_name);
return ret;
}
+
/*
* return: 0: no redundant snapshots, 1: rm process started, negative: error
*/
FOR_EACH_SNAPSHOT(s, i, sl) {
int64_t this_score;
- DSS_DEBUG_LOG("checking %s\n", s->name);
+ //DSS_DEBUG_LOG("checking %s\n", s->name);
if (s->interval > interval) {
prev = s;
continue;
/* check if s is a better victim */
this_score = s->creation_time - prev->creation_time;
assert(this_score >= 0);
- DSS_DEBUG_LOG("%s: score %lli\n", s->name, (long long)score);
+ //DSS_DEBUG_LOG("%s: score %lli\n", s->name, (long long)score);
if (this_score < score) {
score = this_score;
victim = s;
return ret;
}
-
int wait_for_rm_process(void)
{
int status, ret = wait_for_process(rm_pid, &status);
void kill_process(pid_t pid)
{
if (!pid)
- return
+ return;
DSS_WARNING_LOG("sending SIGTERM to pid %d\n", (int)pid);
kill(pid, SIGTERM);
}
-void handle_sighup()
+int check_config(void)
{
- DSS_INFO_LOG("FIXME: no sighup handling yet\n");
+ if (conf.unit_interval_arg <= 0) {
+ make_err_msg("bad unit interval: %i", conf.unit_interval_arg);
+ return -E_INVALID_NUMBER;
+ }
+ DSS_DEBUG_LOG("unit interval: %i day(s)\n", conf.unit_interval_arg);
+ if (conf.num_intervals_arg <= 0) {
+ make_err_msg("bad number of intervals %i", conf.num_intervals_arg);
+ return -E_INVALID_NUMBER;
+ }
+ DSS_DEBUG_LOG("number of intervals: %i\n", conf.num_intervals_arg);
+ return 1;
+}
+
+/* exits on errors */
+void parse_config_file(int override)
+{
+ int ret;
+ char *config_file;
+ struct stat statbuf;
+ char *old_logfile_arg = NULL;
+ int old_daemon_given = 0;
+
+ if (conf.config_file_given)
+ config_file = dss_strdup(conf.config_file_arg);
+ else {
+ char *home = get_homedir();
+ config_file = make_message("%s/.dssrc", home);
+ free(home);
+ }
+ if (override) { /* SIGHUP */
+ if (conf.logfile_given)
+ old_logfile_arg = dss_strdup(conf.logfile_arg);
+ old_daemon_given = conf.daemon_given;
+ }
+
+ ret = stat(config_file, &statbuf);
+ if (ret && conf.config_file_given) {
+ ret = -ERRNO_TO_DSS_ERROR(errno);
+ make_err_msg("failed to stat config file %s", config_file);
+ goto out;
+ }
+ if (!ret) {
+ struct cmdline_parser_params params = {
+ .override = override,
+ .initialize = 0,
+ .check_required = 1,
+ .check_ambiguity = 0
+ };
+ cmdline_parser_config_file(config_file, &conf, ¶ms);
+ }
+ ret = check_config();
+ if (ret < 0)
+ goto out;
+ if (override) {
+ /* don't change daemon mode on SIGHUP */
+ conf.daemon_given = old_daemon_given;
+ close_log(logfile);
+ logfile = NULL;
+ if (conf.logfile_given)
+ free(old_logfile_arg);
+ else if (conf.daemon_given) { /* re-use old logfile */
+ conf.logfile_arg = old_logfile_arg;
+ conf.logfile_given = 1;
+ }
+ }
+ if (conf.logfile_given) {
+ logfile = open_log(conf.logfile_arg);
+ log_welcome(conf.loglevel_arg);
+ }
+ ret = dss_chdir(conf.dest_dir_arg);
+out:
+ free(config_file);
+ if (ret >= 0)
+ return;
+ log_err_msg(EMERG, -ret);
+ exit(EXIT_FAILURE);
+}
+
+void handle_sighup(void)
+{
+ DSS_NOTICE_LOG("SIGHUP\n");
+ parse_config_file(1);
}
int rename_incomplete_snapshot(int64_t start)
return ret;
}
-
int handle_rsync_exit(int status)
{
int es, ret;
return ret;
}
+int get_newest_complete(const char *dirname, void *private)
+{
+ struct edge_snapshot_data *esd = private;
+ struct snapshot s;
+ int ret = is_snapshot(dirname, esd->now, &s);
+
+ if (ret <= 0)
+ return 1;
+ if (s.flags != SS_COMPLETE) /* incomplete or being deleted */
+ return 1;
+ if (s.creation_time < esd->snap.creation_time)
+ return 1;
+ free(esd->snap.name);
+ esd->snap = s;
+ return 1;
+}
+
+__malloc char *name_of_newest_complete_snapshot(void)
+{
+ struct edge_snapshot_data esd = {
+ .now = get_current_time(),
+ .snap = {.creation_time = -1}
+ };
+ for_each_subdir(get_newest_complete, &esd);
+ return esd.snap.name;
+}
+
+void create_rsync_argv(char ***argv, int64_t *num)
+{
+ char *logname, *newest = name_of_newest_complete_snapshot();
+ int i = 0, j;
+
+ *argv = dss_malloc((15 + conf.rsync_option_given) * sizeof(char *));
+ (*argv)[i++] = dss_strdup("rsync");
+ (*argv)[i++] = dss_strdup("-aq");
+ (*argv)[i++] = dss_strdup("--delete");
+ for (j = 0; j < conf.rsync_option_given; j++)
+ (*argv)[i++] = dss_strdup(conf.rsync_option_arg[j]);
+ if (newest) {
+ DSS_INFO_LOG("using %s as reference snapshot\n", newest);
+ (*argv)[i++] = make_message("--link-dest=../%s", newest);
+ 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);
+ else
+ (*argv)[i++] = make_message("%s@%s:%s/", conf.remote_user_given?
+ conf.remote_user_arg : logname,
+ conf.remote_host_arg, conf.source_dir_arg);
+ free(logname);
+ *num = get_current_time();
+ (*argv)[i++] = incomplete_name(*num);
+ (*argv)[i++] = NULL;
+ for (j = 0; j < i; j++)
+ DSS_DEBUG_LOG("argv[%d] = %s\n", j, (*argv)[j]);
+}
+
+void free_rsync_argv(char **argv)
+{
+ int i;
+ for (i = 0; argv[i]; i++)
+ free(argv[i]);
+ free(argv);
+}
+
+int create_snapshot(char **argv)
+{
+ int fds[3] = {0, 0, 0};
+ char *name = incomplete_name(current_snapshot_creation_time);
+
+ DSS_NOTICE_LOG("creating new snapshot %s\n", name);
+ free(name);
+ return dss_exec(&rsync_pid, argv[0], argv, fds);
+}
void compute_next_snapshot_time(struct snapshot_list *sl)
{
tv_add(&now, &tmp, &next_snapshot_time);
}
-void handle_signal(struct snapshot_list *sl)
+void handle_signal(void)
{
int sig, ret = next_signal();
exit(EXIT_FAILURE);
case SIGHUP:
handle_sighup();
+ ret = 1;
break;
case SIGCHLD:
ret = reap_child(&pid, &status);
ret = handle_rsync_exit(status);
else
ret = handle_rm_exit(status);
- free_snapshot_list(sl);
- get_snapshot_list(sl);
- compute_next_snapshot_time(sl);
}
out:
if (ret < 0)
int select_loop(void)
{
int ret;
- struct timeval tv = {.tv_sec = 60, .tv_usec = 0};
+ struct timeval tv = {.tv_sec = 0, .tv_usec = 0};
struct snapshot_list sl = {.num_snapshots = 0};
- get_snapshot_list(&sl);
- compute_next_snapshot_time(&sl);
for (;;) {
- struct timeval now;
+ struct timeval now, *tvp = &tv;
fd_set rfds;
int low_disk_space;
+ char **rsync_argv;
+ free_snapshot_list(&sl);
+ get_snapshot_list(&sl);
+ compute_next_snapshot_time(&sl);
FD_ZERO(&rfds);
- ret = dss_select(signal_pipe + 1, &rfds, NULL, &tv);
+ FD_SET(signal_pipe, &rfds);
+ if (rsync_pid)
+ tv.tv_sec = 60;
+ else if (rm_pid)
+ tvp = NULL;
+ ret = dss_select(signal_pipe + 1, &rfds, NULL, tvp);
if (ret < 0)
return ret;
- if (FD_ISSET(signal_pipe, &rfds))
- handle_signal(&sl);
+ if (FD_ISSET(signal_pipe, &rfds)) {
+ handle_signal();
+ continue;
+ }
if (rm_pid)
continue;
ret = disk_space_low();
}
/* neither rsync nor rm are running. Start rsync? */
gettimeofday(&now, NULL);
- if (tv_diff(&now, &next_snapshot_time, NULL) < 0)
+ if (tv_diff(&next_snapshot_time, &now, &tv) > 0)
continue;
+ create_rsync_argv(&rsync_argv, ¤t_snapshot_creation_time);
+ ret = create_snapshot(rsync_argv);
+ free_rsync_argv(rsync_argv);
+ if (ret < 0)
+ break;
}
free_snapshot_list(&sl);
return ret;
return ret;
}
-int get_newest_complete(const char *dirname, void *private)
-{
- struct edge_snapshot_data *esd = private;
- struct snapshot s;
- int ret = is_snapshot(dirname, esd->now, &s);
-
- if (ret <= 0)
- return 1;
- if (s.flags != SS_COMPLETE) /* incomplete or being deleted */
- return 1;
- if (s.creation_time < esd->snap.creation_time)
- return 1;
- free(esd->snap.name);
- esd->snap = s;
- return 1;
-}
-
-__malloc char *name_of_newest_complete_snapshot(void)
-{
- struct edge_snapshot_data esd = {
- .now = get_current_time(),
- .snap = {.creation_time = -1}
- };
- for_each_subdir(get_newest_complete, &esd);
- return esd.snap.name;
-}
-
-void create_rsync_argv(char ***argv, int64_t *num)
-{
- char *logname, *newest = name_of_newest_complete_snapshot();
- int i = 0, j;
-
- *argv = dss_malloc((15 + conf.rsync_option_given) * sizeof(char *));
- (*argv)[i++] = dss_strdup("rsync");
- (*argv)[i++] = dss_strdup("-aq");
- (*argv)[i++] = dss_strdup("--delete");
- for (j = 0; j < conf.rsync_option_given; j++)
- (*argv)[i++] = dss_strdup(conf.rsync_option_arg[j]);
- if (newest) {
- DSS_INFO_LOG("using %s as reference snapshot\n", newest);
- (*argv)[i++] = make_message("--link-dest=../%s", newest);
- free(newest);
- } else
- DSS_INFO_LOG("no previous snapshot found");
- 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);
- else
- (*argv)[i++] = make_message("%s@%s:%s/", conf.remote_user_given?
- conf.remote_user_arg : logname,
- conf.remote_host_arg, conf.source_dir_arg);
- free(logname);
- *num = get_current_time();
- (*argv)[i++] = incomplete_name(*num);
- (*argv)[i++] = NULL;
- for (j = 0; j < i; j++)
- DSS_DEBUG_LOG("argv[%d] = %s\n", j, (*argv)[j]);
-}
-
-void free_rsync_argv(char **argv)
-{
- int i;
- for (i = 0; argv[i]; i++)
- free(argv[i]);
- free(argv);
-}
-
-int create_snapshot(char **argv)
-{
- int fds[3] = {0, 0, 0};
-
- return dss_exec(&rsync_pid, argv[0], argv, fds);
-}
-
int com_create(void)
{
int ret, status;
free(msg);
return 1;
}
- DSS_NOTICE_LOG("creating snapshot %lli\n",
- (long long)current_snapshot_creation_time);
ret = create_snapshot(rsync_argv);
if (ret < 0)
goto out;
return 1;
}
-/* TODO: Unlink pid file */
__noreturn void clean_exit(int status)
{
- //kill(0, SIGTERM);
free(dss_error_txt);
exit(status);
}
-
-int read_config_file(void)
-{
- int ret;
- char *config_file;
- struct stat statbuf;
-
- if (conf.config_file_given)
- config_file = dss_strdup(conf.config_file_arg);
- else {
- char *home = get_homedir();
- config_file = make_message("%s/.dssrc", home);
- free(home);
- }
- ret = stat(config_file, &statbuf);
- if (ret && conf.config_file_given) {
- ret = -ERRNO_TO_DSS_ERROR(errno);
- make_err_msg("failed to stat config file %s", config_file);
- goto out;
- }
- if (!ret) {
- struct cmdline_parser_params params = {
- .override = 0,
- .initialize = 0,
- .check_required = 0,
- .check_ambiguity = 0
- };
- cmdline_parser_config_file(config_file, &conf, ¶ms);
- }
- if (!conf.source_dir_given || !conf.dest_dir_given) {
- ret = -E_SYNTAX;
- make_err_msg("you need to specify both source_dir and dest_dir");
- goto out;
- }
- ret = 1;
-out:
- free(config_file);
- return ret;
-}
-
-int check_config(void)
-{
- if (conf.unit_interval_arg <= 0) {
- make_err_msg("bad unit interval: %i", conf.unit_interval_arg);
- return -E_INVALID_NUMBER;
- }
- DSS_DEBUG_LOG("unit interval: %i day(s)\n", conf.unit_interval_arg);
- if (conf.num_intervals_arg <= 0) {
- make_err_msg("bad number of intervals %i", conf.num_intervals_arg);
- return -E_INVALID_NUMBER;
- }
- DSS_DEBUG_LOG("number of intervals: %i\n", conf.num_intervals_arg);
- return 1;
-}
-
static void setup_signal_handling(void)
{
int ret;
- DSS_NOTICE_LOG("setting up signal handlers\n");
+ DSS_INFO_LOG("setting up signal handlers\n");
signal_pipe = signal_init(); /* always successful */
ret = install_sighandler(SIGINT);
if (ret < 0)
exit(EXIT_FAILURE);
}
-
int main(int argc, char **argv)
{
int ret;
+ struct cmdline_parser_params params = {
+ .override = 0,
+ .initialize = 1,
+ .check_required = 0,
+ .check_ambiguity = 0
+ };
- cmdline_parser(argc, argv, &conf); /* aborts on errors */
- if (conf.inputs_num) {
- ret = -E_SYNTAX;
- make_err_msg("additional non-options given");
- goto out;
- }
- ret = read_config_file();
- if (ret < 0)
- goto out;
- ret = check_config();
- if (ret < 0)
- goto out;
- if (conf.logfile_given) {
- logfile = open_log(conf.logfile_arg);
- log_welcome(conf.loglevel_arg);
- }
- ret = dss_chdir(conf.dest_dir_arg);
- if (ret < 0)
- goto out;
+ cmdline_parser_ext(argc, argv, &conf, ¶ms); /* aborts on errors */
+ parse_config_file(0);
if (conf.daemon_given)
daemon_init();
setup_signal_handling();
ret = call_command_handler();
-out:
if (ret < 0)
log_err_msg(EMERG, -ret);
clean_exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
projects / dss.git / blobdiff