Better handle a case where a force-sync command comes in immediately

after (or during) a sync, i.e. less than MinimumFileAge seconds after
the last one. In this case, just move back the syncPeriodStart by 1 second.
(refs #3, merges part if [1459])

1 files changed, 12 insertions, 0 deletions

diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index 894d6b1f..a24d7824 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -646,6 +646,18 @@ void BackupDaemon::Run2()
 			box_time_t syncPeriodEnd = currentSyncStartTime - 
 				minimumFileAge;
 
+			if(syncPeriodStart >= syncPeriodEnd &&
+				syncPeriodStart - syncPeriodEnd < minimumFileAge)
+			{
+				// This can happen if we receive a force-sync
+				// command less than minimumFileAge after
+				// the last sync. Deal with it by moving back
+				// syncPeriodStart, which should not do any
+				// damage.
+				syncPeriodStart = syncPeriodEnd -
+					SecondsToBoxTime(1);
+			}
+
 			if(syncPeriodStart >= syncPeriodEnd)
 			{
 				BOX_ERROR("Invalid (negative) sync period: "