RavenDB-22583 : fix failing resharding test - increase timeout for bi…

…g bucket migration
aviv86 · Jul 14, 2024 · 5d208b6 · 5d208b6
1 parent 6ae5d69
commit 5d208b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/SlowTests/Sharding/PrefixedSharding.cs b/test/SlowTests/Sharding/PrefixedSharding.cs
@@ -1633,7 +1633,7 @@ await store.Maintenance.SendAsync(new UpdatePrefixedShardingSettingOperation(new
         }));
 
         // move big bucket to the newly added shard
-        await Sharding.Resharding.MoveShardForId(store, $"users/0${bigBucketId}", toShard: 2);
+        await Sharding.Resharding.MoveShardForId(store, $"users/0${bigBucketId}", toShard: 2, timeout: 90_000);
 
         // assert stats 
         using (shard.DocumentsStorage.ContextPool.AllocateOperationContext(out DocumentsOperationContext ctx))

diff --git a/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs b/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs
@@ -81,9 +81,9 @@ public async Task<int> StartMovingShardForId(IDocumentStore store, string id, in
             return bucket;
         }
 
-        public async Task WaitForMigrationComplete(IDocumentStore store, int bucket)
+        public async Task WaitForMigrationComplete(IDocumentStore store, int bucket, int timeout = 30_000)
         {
-            using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
+            using (var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(timeout)))
             {
                 var record = await store.Maintenance.Server.SendAsync(new GetDatabaseRecordOperation(store.Database), cts.Token);
                 while (record.Sharding.BucketMigrations.ContainsKey(bucket))
@@ -94,13 +94,13 @@ record = await store.Maintenance.Server.SendAsync(new GetDatabaseRecordOperation
             }
         }
 
-        public async Task MoveShardForId(IDocumentStore store, string id, int? toShard = null, List<RavenServer> servers = null)
+        public async Task MoveShardForId(IDocumentStore store, string id, int? toShard = null, List<RavenServer> servers = null, int timeout = 30_000)
         {
             try
             {
                 servers ??= _parent.GetServers();
                 var bucket = await StartMovingShardForId(store, id, toShard, servers);
-                await WaitForMigrationComplete(store, bucket);
+                await WaitForMigrationComplete(store, bucket, timeout);
             }
             catch (Exception e)
             {