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

diff --git a/dss.c b/dss.c
index bdbdd04..a50a3de 100644
--- a/dss.c
+++ b/dss.c
@@ -303,7 +303,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 +312,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 +862,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;