X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=4c068c6c96443f44b15e5c78e5977dad83a4f36d;hp=bdbdd043ef8c4651bf921a72050526b84c968a6d;hb=ee132d4f3e81eaaaeee94ceaf9f960c50bc7d448;hpb=59a00ae47578272f3ca9cf882ebeb5dfe16ba6c6

diff --git a/dss.c b/dss.c
index bdbdd04..4c068c6 100644
--- a/dss.c
+++ b/dss.c
@@ -5,12 +5,14 @@
  */
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <errno.h>
 #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 +305,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 +314,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;
@@ -862,6 +864,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;
@@ -973,7 +979,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();
@@ -981,7 +987,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;
@@ -995,12 +1001,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++) {
@@ -1014,7 +1020,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);
@@ -1051,7 +1057,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");
@@ -1151,11 +1157,11 @@ static int rename_resume_snap(int64_t creation_time)
 	s = find_orphaned_snapshot(&sl);
 out:
 	if (s) {
-		DSS_INFO_LOG(("reusing %s snapshot %s\n", why, s->name));
+		DSS_NOTICE_LOG(("recycling %s snapshot %s\n", why, s->name));
 		ret = dss_rename(s->name, new_name);
 	}
 	if (ret >= 0)
-		DSS_NOTICE_LOG(("creating new snapshot %s\n", new_name));
+		DSS_NOTICE_LOG(("creating %s\n", new_name));
 	free(new_name);
 	free_snapshot_list(&sl);
 	return ret;
@@ -1502,6 +1508,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 */