RavenDB-16815 - do todos 2

garayx · Sep 18, 2024 · 6a0fb68 · 6a0fb68
1 parent 41069b3
commit 6a0fb68
Show file tree

Hide file tree

Showing 5 changed files with 190 additions and 165 deletions.
diff --git a/src/Raven.Server/Documents/PeriodicBackup/DirectUpload/BackupDestinationStream.cs b/src/Raven.Server/Documents/PeriodicBackup/DirectUpload/BackupDestinationStream.cs
@@ -11,7 +11,7 @@ public struct BackupDestinationStream : IDisposable
 
     public void Dispose()
     {
-        BackupUploader?.Dispose();
+        BackupUploader?.Reset();
         Stream?.Dispose();
     }
 }
diff --git a/src/Raven.Server/Documents/PeriodicBackup/DirectUpload/DirectBackupUploader.cs b/src/Raven.Server/Documents/PeriodicBackup/DirectUpload/DirectBackupUploader.cs
@@ -7,6 +7,7 @@
 using Raven.Client.Documents.Operations;
 using Raven.Client.Documents.Operations.Backups;
 using Raven.Client.Extensions;
+using Raven.Client.Util;
 using Raven.Server.Documents.PeriodicBackup.Aws;
 using Raven.Server.Documents.PeriodicBackup.Azure;
 using Raven.Server.Documents.PeriodicBackup.Retention;
@@ -17,7 +18,7 @@
 
 namespace Raven.Server.Documents.PeriodicBackup.DirectUpload;
 
-public sealed class DirectBackupUploader : BackupUploaderBase, IDisposable
+public sealed class DirectBackupUploader : BackupUploaderBase
 {
     private readonly BackupConfiguration.BackupDestination _destination;
 
@@ -106,6 +107,7 @@ public void CreateUploadTask(DocumentDatabase database, Stream attachmentStream,
 
                 AddInfo($"Starting the upload of retired attachment '{objKeyName}'.");
 
+                using (attachmentStream)
                 using (var stream = StreamForBackupDestination(database, folderName, objKeyName))
                     attachmentStream.CopyTo(stream);
 
@@ -162,19 +164,18 @@ public bool TryCleanFinishedThreads(Stopwatch sp, OperationCancelToken token)
             return false;
         }
 
+
         return true;
     }
 
-    public void Dispose()
+    public IDisposable Initialize()
     {
-        Execute();
-        _threads.Clear();
+        return new DisposableAction(Reset);
     }
 
     public void Reset()
     {
         Execute();
         _threads.Clear();
     }
-
 }