X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=5f7cfe04599ef8c60b7a68c94ff26cd44117e28d;hp=07a60425170ddab063ee6071d4901993a9db8c62;hb=ce9d8dbb002447f4a7de548a1e3fe3ec5ead73b6;hpb=90e4077abd237cfd03def4ea023a70ccd9167bcf

diff --git a/dss.c b/dss.c
index 07a6042..5f7cfe0 100644
--- a/dss.c
+++ b/dss.c
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <inttypes.h>
@@ -303,7 +304,7 @@ static int64_t compute_next_snapshot_time(void)
 	int64_t x = 0, now = get_current_time(), unit_interval
 		= 24 * 3600 * conf.unit_interval_arg, ret;
 	unsigned wanted = desired_number_of_snapshots(0, conf.num_intervals_arg),
-		num_complete_snapshots = 0;
+		num_complete = 0;
 	int i;
 	struct snapshot *s = NULL;
 	struct snapshot_list sl;
@@ -312,15 +313,15 @@ static int64_t compute_next_snapshot_time(void)
 	FOR_EACH_SNAPSHOT(s, i, &sl) {
 		if (!(s->flags & SS_COMPLETE))
 			continue;
-		num_complete_snapshots++;
+		num_complete++;
 		x += s->completion_time - s->creation_time;
 	}
 	assert(x >= 0);
 
 	ret = now;
-	if (num_complete_snapshots == 0)
+	if (num_complete == 0)
 		goto out;
-	x /= num_complete_snapshots; /* avg time to create one snapshot */
+	x /= num_complete; /* avg time to create one snapshot */
 	if (unit_interval < x * wanted) /* oops, no sleep at all */
 		goto out;
 	ret = s->completion_time + unit_interval / wanted - x;
@@ -606,9 +607,18 @@ static int try_to_free_disk_space(void)
 		if (next_snapshot_is_due())
 			return 0;
 	}
+	/*
+	 * Idle and --keep_redundant not given, or low disk space. Look at
+	 * existing snapshots.
+	 */
 	dss_get_snapshot_list(&sl);
 	ret = 0;
-	if (!low_disk_space && sl.num_snapshots <= 1)
+	/*
+	 * Don't remove anything if there is free space and we have fewer
+	 * snapshots than configured, plus one. This way there is always one
+	 * snapshot that can be recycled.
+	 */
+	if (!low_disk_space && sl.num_snapshots <= 1 << conf.num_intervals_arg)
 		goto out;
 	why = "outdated";
 	victim = find_outdated_snapshot(&sl);
@@ -618,13 +628,13 @@ static int try_to_free_disk_space(void)
 	victim = find_redundant_snapshot(&sl);
 	if (victim)
 		goto remove;
-	/* try harder only if disk space is low */
-	if (!low_disk_space)
-		goto out;
 	why = "orphaned";
 	victim = find_orphaned_snapshot(&sl);
 	if (victim)
 		goto remove;
+	/* try harder only if disk space is low */
+	if (!low_disk_space)
+		goto out;
 	DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
 	victim = find_oldest_removable_snapshot(&sl);
 	if (victim)
@@ -853,6 +863,10 @@ static int handle_rsync_exit(int status)
 	if (es != 0 && es != 24) {
 		DSS_WARNING_LOG(("rsync exit code %d, error count %d\n",
 			es, ++num_consecutive_rsync_errors));
+		if (conf.create_given) {
+			ret = -E_BAD_EXIT_CODE;
+			goto out;
+		}
 		if (num_consecutive_rsync_errors > conf.max_rsync_errors_arg) {
 			ret = -E_TOO_MANY_RSYNC_ERRORS;
 			snapshot_creation_status = HS_READY;
@@ -964,7 +978,7 @@ static int check_config(void)
  * Returns < 0 on errors, 0 if no config file is given and > 0 if the config
  * file was read successfully.
  */
-static int parse_config_file(int override)
+static int parse_config_file(bool sighup)
 {
 	int ret, config_file_exists;
 	char *config_file = get_config_file_name();
@@ -972,7 +986,7 @@ static int parse_config_file(int override)
 	char *old_logfile_arg = NULL;
 	int old_daemon_given = 0;
 
-	if (override) { /* SIGHUP */
+	if (sighup) {
 		if (conf.logfile_given)
 			old_logfile_arg = dss_strdup(conf.logfile_arg);
 		old_daemon_given = conf.daemon_given;
@@ -986,12 +1000,12 @@ static int parse_config_file(int override)
 	}
 	if (config_file_exists) {
 		struct cmdline_parser_params params;
-		params.override = override;
+		params.override = sighup;
 		params.initialize = 0;
 		params.check_required = 1;
 		params.check_ambiguity = 0;
 		params.print_errors = 1;
-		if (override) { /* invalidate all rsync options */
+		if (sighup) { /* invalidate all rsync options */
 			int i;
 
 			for (i = 0; i < conf.rsync_option_given; i++) {
@@ -1005,7 +1019,7 @@ static int parse_config_file(int override)
 	ret = check_config();
 	if (ret < 0)
 		goto out;
-	if (override) {
+	if (sighup) {
 		/* don't change daemon mode on SIGHUP */
 		conf.daemon_given = old_daemon_given;
 		close_log(logfile);
@@ -1042,7 +1056,7 @@ static int handle_sighup(void)
 
 	DSS_NOTICE_LOG(("SIGHUP, re-reading config\n"));
 	dump_dss_config("old");
-	ret = parse_config_file(1);
+	ret = parse_config_file(true /* SIGHUP */);
 	if (ret < 0)
 		return ret;
 	dump_dss_config("reloaded");
@@ -1480,12 +1494,6 @@ static int setup_signal_handling(void)
 	return install_sighandler(SIGCHLD);
 }
 
-/**
- * The main function of dss.
- *
- * \param argc Usual argument count.
- * \param argv Usual argument vector.
- */
 int main(int argc, char **argv)
 {
 	int ret;
@@ -1499,6 +1507,7 @@ int main(int argc, char **argv)
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	ret = parse_config_file(0);
+	ret = parse_config_file(false /* no SIGHUP */);
 	if (ret < 0)
 		goto out;
 	if (ret == 0) { /* no config file given */