Cleanup minio after scenario

Signed-off-by: Victor Chang <vicchang@nvidia.com>
Project-MONAI · Nov 8, 2022 · 706e6fc · 706e6fc
1 parent 9da286b
commit 706e6fc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/tests/Integration.Test/Common/MinioDataSink.cs b/tests/Integration.Test/Common/MinioDataSink.cs
@@ -37,10 +37,7 @@ public MinioDataClient(Configurations configurations, InformaticsGatewayConfigur
 
         public async Task SendAsync(DataProvider dataProvider, params object[] args)
         {
-            var minioClient = new MinioClient()
-                .WithEndpoint(_options.Storage.Settings["endpoint"])
-                .WithCredentials(_options.Storage.Settings["accessKey"], _options.Storage.Settings["accessToken"])
-            .Build();
+            var minioClient = CreateMinioClient();
 
             var stopwatch = new Stopwatch();
             stopwatch.Start();
@@ -64,5 +61,33 @@ public async Task SendAsync(DataProvider dataProvider, params object[] args)
             stopwatch.Stop();
             _outputHelper.WriteLine($"Time to upload to Minio={0}s...", stopwatch.Elapsed.TotalSeconds);
         }
+
+        private MinioClient CreateMinioClient() => new MinioClient()
+                        .WithEndpoint(_options.Storage.Settings["endpoint"])
+                        .WithCredentials(_options.Storage.Settings["accessKey"], _options.Storage.Settings["accessToken"])
+                    .Build();
+
+        internal async Task CleanBucketAsync()
+        {
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+            var minioClient = CreateMinioClient();
+            var toBeRemoved = new List<string>();
+            var listObjectArgs = new ListObjectsArgs()
+                .WithBucket(_options.Storage.StorageServiceBucketName)
+                .WithRecursive(true);
+            var objects = minioClient.ListObjectsAsync(listObjectArgs);
+            objects.Subscribe((item) =>
+            {
+                toBeRemoved.Add(item.Key);
+            });
+            var deletObjectsArgs = new RemoveObjectsArgs()
+                .WithBucket(_options.Storage.StorageServiceBucketName)
+                .WithObjects(toBeRemoved);
+            await minioClient.RemoveObjectsAsync(deletObjectsArgs).ConfigureAwait(false);
+
+            stopwatch.Stop();
+            _outputHelper.WriteLine($"Cleaned up {0} objects from Minio in {1}s...", toBeRemoved.Count, stopwatch.Elapsed.TotalSeconds);
+        }
     }
 }
diff --git a/tests/Integration.Test/Hooks/TestHooks.cs b/tests/Integration.Test/Hooks/TestHooks.cs
@@ -179,6 +179,7 @@ public static void Shtudown()
         [AfterScenario]
         public static void ClearTestData()
         {
+            s_minioSink.CleanBucketAsync();
             RabbitConnectionFactory.PurgeAllQueues(s_options.Value.Messaging);
         }
 

diff --git a/tests/Integration.Test/study.json b/tests/Integration.Test/study.json
@@ -2,8 +2,8 @@
   "MR": {
     "SeriesMin": 1,
     "SeriesMax": 2,
-    "InstanceMin": 32,
-    "InstanceMax": 64,
+    "InstanceMin": 64,
+    "InstanceMax": 128,
     "SizeMin": 0.36,
     "SizeMax": 2
   },