haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4180 from warwickmm/fix_duplicate_runs_after_pause

Browse Source 
Fix issue where multiple backups could occur after pause
This commit is contained in:
Kenneth Skovhede
2020-05-10 21:09:21 +02:00
committed by GitHub
parent dd3f127544 1036b64002
commit e7e109e840
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/Scheduler.cs
+28 -4
View File
@@ -81,6 +81,7 @@ namespace Duplicati.Server
m_thread = new Thread(new ThreadStart(Runner));
m_worker = worker;
m_worker.CompletedWork += OnCompleted;
m_worker.StartingWork += OnStartingWork;
m_schedule = new KeyValuePair<DateTime, ISchedule>[0];
m_terminate = false;
m_event = new AutoResetEvent(false);
@@ -211,7 +212,25 @@ namespace Duplicati.Server
}
}
private void OnStartingWork(WorkerThread<Runner.IRunnerData> worker, Runner.IRunnerData task)
{
if (task is null)
{
return;
}
lock(m_lock)
{
if (m_updateTasks.TryGetValue(task, out Tuple<ISchedule, DateTime, DateTime> scheduleInfo))
{
// Item2 is the scheduled start time (Time in the Schedule table).
// Item3 is the actual start time (LastRun in the Schedule table).
m_updateTasks[task] = Tuple.Create(scheduleInfo.Item1, scheduleInfo.Item2, DateTime.UtcNow);
}
}
}
/// <summary>
/// The actual scheduling procedure
/// </summary>
@@ -308,10 +327,15 @@ namespace Duplicati.Server
Server.Runner.IRunnerData lastJob = jobsToRun.LastOrDefault();
if (lastJob != null)
lock(m_lock)
{
lock (m_lock)
{
// The actual last run time will be updated when the StartingWork event is raised.
m_updateTasks[lastJob] = new Tuple<ISchedule, DateTime, DateTime>(sc, start, DateTime.UtcNow);
foreach(var job in jobsToRun)
}
}
foreach (var job in jobsToRun)
m_worker.AddTask(job);
if (start < DateTime.UtcNow)