From: Andre Noll <maan@systemlinux.org>
Date: Fri, 12 Mar 2010 14:47:07 +0000 (+0100)
Subject: Avoid busy loop on rsync exit status 12 or 13.
X-Git-Tag: v0.1.4~13
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=fd7ab0475e24ec414883bf3772db160869ed2e0c;ds=sidebyside

Avoid busy loop on rsync exit status 12 or 13.

Although we set the next snapshot time to now + 60 seconds in case
rsync exits with exit status 12 or 13, we miss to check this time
barrier in case the snapshot creation status is HS_NEEDS_RESTART.

Fix this by adding an additional check in the switch() statement
of the select loop. As this change would trigger the assertion

	snapshot_creation_status == HS_READY

in next_snapshot_is_due(), remove this assertion.
---

diff --git a/dss.c b/dss.c
index 9589f9d..0a2f55b 100644
--- a/dss.c
+++ b/dss.c
@@ -197,7 +197,6 @@ static int next_snapshot_is_due(void)
 {
 	int64_t now = get_current_time();
 
-	assert(snapshot_creation_status == HS_READY);
 	if (!next_snapshot_time_is_valid())
 		next_snapshot_time = compute_next_snapshot_time();
 	if (next_snapshot_time <= now) {
@@ -1124,6 +1123,8 @@ static int select_loop(void)
 			create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
 			/* fall through */
 		case HS_NEEDS_RESTART:
+			if (!next_snapshot_is_due())
+				continue;
 			ret = create_snapshot(rsync_argv);
 			if (ret < 0)
 				goto out;