RavenDB-20788 : address PR comment

aviv86 · Jul 18, 2023 · d4d43f8 · d4d43f8
1 parent cc91e57
commit d4d43f8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Raven.Server/Documents/Sharding/ShardedDocumentDatabase.cs b/src/Raven.Server/Documents/Sharding/ShardedDocumentDatabase.cs
@@ -213,7 +213,7 @@ public async Task DeleteBucketAsync(int bucket, long migrationIndex, long confir
 
         // before starting cleanup, wait for DestinationMigrationConfirm command
         // to be applied in all orchestrator nodes
-        await WaitForConfirmationIndex(confirmationIndex);
+        await WaitForOrchestratorConfirmationAsync(confirmationIndex);
 
         while (true)
         {
@@ -238,7 +238,7 @@ public async Task DeleteBucketAsync(int bucket, long migrationIndex, long confir
         }
     }
 
-    private async Task WaitForConfirmationIndex(long confirmationIndex)
+    private async Task WaitForOrchestratorConfirmationAsync(long confirmationIndex)
     {
         var cmd = new WaitForIndexNotificationCommand(new List<long> { confirmationIndex });
         var tasks = new List<Task>(ShardingConfiguration.Orchestrator.Topology.Members.Count);
@@ -260,7 +260,14 @@ private async Task WaitForConfirmationIndex(long confirmationIndex)
             tasks.Add(t);
         }
 
-        await Task.WhenAll(tasks);
+        try
+        {
+            await Task.WhenAll(tasks);
+        }
+        catch (Exception e)
+        {
+            throw new InvalidOperationException($"failed to wait for migration confirmation index '{confirmationIndex}' on Orchestrator nodes: {ShardingConfiguration.Orchestrator.Topology}. Error : {e}");
+        }
     }
 
     public static ShardedDocumentDatabase CastToShardedDocumentDatabase(DocumentDatabase database) => database as ShardedDocumentDatabase ?? throw new ArgumentException($"Database {database.Name} must be sharded!");