X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=cd69c27d85a5066a49c00817621db6371c01d31e;hp=9dc717da90db8338471268e5a0443c398a7cda72;hb=d15fcc8cfc895463cb25c94b5333d309321c82cd;hpb=a24b8c773e1d5be1497c8cbbfe9707d15e88bf7b diff --git a/dss.c b/dss.c index 9dc717d..cd69c27 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 @@ -29,11 +34,12 @@ #include "time.h" #include "snap.h" - +/** Command line and config file options. */ static struct gengetopt_args_info conf; +/** Non-NULL if we log to a file. */ 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 */ @@ -46,11 +52,11 @@ static struct timeval next_snapshot_time; 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. */ +/** 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; @@ -76,6 +82,14 @@ static int call_command_handler(void) #undef COMMAND #undef COMMANDS +/** + * The log function of dss. + * + * \param ll Loglevel. + * \param fml Usual format string. + * + * All DSS_XXX_LOG() macros use this function. + */ __printf_2_3 void dss_log(int ll, const char* fmt,...) { va_list argp; @@ -110,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; @@ -124,6 +137,9 @@ static int disk_space_low(void) if (conf.min_free_percent_arg) if (ds.percent_free < conf.min_free_percent_arg) return 1; + if (conf.min_free_percent_inodes_arg) + if (ds.percent_free_inodes < conf.min_free_percent_inodes_arg) + return 1; return 0; } @@ -202,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]; @@ -259,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) @@ -329,7 +345,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; @@ -543,7 +559,6 @@ static int handle_sigchld(void) exit(EXIT_FAILURE); } - static int check_config(void) { if (conf.unit_interval_arg <= 0) { @@ -592,7 +607,8 @@ static void parse_config_file(int override) .override = override, .initialize = 0, .check_required = 1, - .check_ambiguity = 0 + .check_ambiguity = 0, + .print_errors = 1 }; cmdline_parser_config_file(config_file, &conf, ¶ms); } @@ -617,7 +633,6 @@ static void parse_config_file(int override) } DSS_EMERG_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) @@ -626,10 +641,23 @@ out: exit(EXIT_FAILURE); } +static void 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); +} + static void handle_sighup(void) { DSS_NOTICE_LOG("SIGHUP\n"); parse_config_file(1); + change_to_dest_dir(); } static void handle_signal(void) @@ -681,11 +709,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); @@ -727,21 +750,25 @@ 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; 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; @@ -762,7 +789,7 @@ static int select_loop(void) } 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: @@ -931,7 +958,12 @@ err: exit(EXIT_FAILURE); } - +/** + * The main function of dss. + * + * \param argc Usual argument count. + * \param argv Usual argument vector. + */ int main(int argc, char **argv) { int ret; @@ -939,7 +971,8 @@ int main(int argc, char **argv) .override = 0, .initialize = 1, .check_required = 0, - .check_ambiguity = 0 + .check_ambiguity = 0, + .print_errors = 1 }; cmdline_parser_ext(argc, argv, &conf, ¶ms); /* aborts on errors */ @@ -947,6 +980,7 @@ int main(int argc, char **argv) if (conf.daemon_given) daemon_init(); + change_to_dest_dir(); setup_signal_handling(); ret = call_command_handler(); if (ret < 0)