Cancel the FlushBackend task if upload exception occurs.

This should avoid the problem of something awaiting a FlushBackend.LastWriteSizeAync task that may never complete.
2019-03-31 19:41:09 -07:00
parent 9a80e422e9
commit be21e09db1
1 changed files with 7 additions and 0 deletions
@@ -39,6 +39,12 @@ namespace Duplicati.Library.Main.Operation.Backup
    {
        public Task<long> LastWriteSizeAsync { get { return m_tcs.Task; } }
        private readonly TaskCompletionSource<long> m_tcs = new TaskCompletionSource<long>();
+        
+        public void TrySetCanceled()
+        {
+            m_tcs.TrySetCanceled();
+        }
+        
        public void SetFlushed(long size)
        {
            m_tcs.TrySetResult(size);
@@ -171,6 +177,7 @@ namespace Duplicati.Library.Main.Operation.Backup
                                Task finishedTask = await Task.WhenAny(workers.Select(w => w.Task)).ConfigureAwait(false);
                                if (finishedTask.IsFaulted)
                                {
+                                    flush.TrySetCanceled();
                                    ExceptionDispatchInfo.Capture(finishedTask.Exception).Throw();
                                }