From f06099f1dae9fb9d3307768a07d557bbbea8d247 Mon Sep 17 00:00:00 2001
From: aviv <aviv@ravendb.net>
Date: Wed, 7 Feb 2024 13:50:05 +0200
Subject: [PATCH] RavenDB-17793 : fix failing tests

---
 src/Raven.Server/ServerWide/ShardingStore.cs                 | 5 ++++-
 test/FastTests/Client/RavenCommandTest.cs                    | 3 ++-
 test/SlowTests/Sharding/PrefixedSharding.cs                  | 3 ++-
 .../Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Raven.Server/ServerWide/ShardingStore.cs b/src/Raven.Server/ServerWide/ShardingStore.cs
index 14e0cee30cf..27422e53cba 100644
--- a/src/Raven.Server/ServerWide/ShardingStore.cs
+++ b/src/Raven.Server/ServerWide/ShardingStore.cs
@@ -30,7 +30,10 @@ public ShardingStore([NotNull] ServerStore serverStore)
             _serverStore = serverStore ?? throw new ArgumentNullException(nameof(serverStore));
         }
 
-        public Task<(long Index, object Result)> StartBucketMigration(string database, int bucket, int toShard, string prefix = null, string raftId = null)
+        public Task<(long Index, object Result)> StartBucketMigration(string database, int bucket, int toShard, string raftId = null) =>
+            StartBucketMigration(database, bucket, toShard, prefix: null, raftId);
+
+        public Task<(long Index, object Result)> StartBucketMigration(string database, int bucket, int toShard, string prefix, string raftId)
         {
             var cmd = new StartBucketMigrationCommand(bucket, toShard, database, prefix, raftId ?? RaftIdGenerator.NewId());
             return _serverStore.SendToLeaderAsync(cmd);
diff --git a/test/FastTests/Client/RavenCommandTest.cs b/test/FastTests/Client/RavenCommandTest.cs
index df6fc46862a..519ecd151b2 100644
--- a/test/FastTests/Client/RavenCommandTest.cs
+++ b/test/FastTests/Client/RavenCommandTest.cs
@@ -70,7 +70,8 @@ public void WhenCommandCanBeCheckedForFastestNode_ItCanRunInParallel()
                 "AddDatabaseShardCommand", "GetNextServerOperationIdCommand", "KillServerOperationCommand", "ModifyDatabaseTopologyCommand", "DelayBackupCommand",
                 "PutDatabaseClientConfigurationCommand", "PutDatabaseSettingsCommand", "PutDatabaseStudioConfigurationCommand", "GetTcpInfoForReplicationCommand",
                 "AddQueueSinkCommand", "UpdateQueueSinkCommand", "ConfigureDataArchivalCommand",
-                "AdoptOrphanedRevisionsCommand"
+                "AdoptOrphanedRevisionsCommand",
+                "AddPrefixedShardingSettingCommand", "DeletePrefixedShardingSettingCommand", "UpdatePrefixedShardingSettingCommand"
             }.OrderBy(t => t);
 
             var commandBaseType = typeof(RavenCommand<>);
diff --git a/test/SlowTests/Sharding/PrefixedSharding.cs b/test/SlowTests/Sharding/PrefixedSharding.cs
index 644a9274ced..695c56fb75e 100644
--- a/test/SlowTests/Sharding/PrefixedSharding.cs
+++ b/test/SlowTests/Sharding/PrefixedSharding.cs
@@ -10,6 +10,7 @@
 using Raven.Client.Exceptions;
 using Raven.Client.ServerWide.Operations;
 using Raven.Client.ServerWide.Sharding;
+using Raven.Client.Util;
 using Raven.Server.Documents;
 using Raven.Server.Documents.Sharding;
 using Raven.Server.Rachis;
@@ -1558,7 +1559,7 @@ public async Task ShouldThrowOnAttemptToMovePrefixedBucketToShardNotInPrefixSett
 
         // shard #2 is not a part of Prefixed['users/'].Shards 
         await Assert.ThrowsAsync<RachisApplyException>(async ()=> 
-            await Server.ServerStore.Sharding.StartBucketMigration(store.Database, bucket, toShard : 2, prefix: "users/"));
+            await Server.ServerStore.Sharding.StartBucketMigration(store.Database, bucket, toShard : 2, prefix: "users/", RaftIdGenerator.NewId()));
     }
 
     [RavenFact(RavenTestCategory.Sharding)]
diff --git a/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs b/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs
index ecbad472a04..236d6ce5e60 100644
--- a/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs
+++ b/test/Tests.Infrastructure/RavenTestBase.ReshardingTestBase.cs
@@ -6,6 +6,7 @@
 using Raven.Client.Documents;
 using Raven.Client.ServerWide.Operations;
 using Raven.Client.ServerWide.Sharding;
+using Raven.Client.Util;
 using Raven.Server;
 using Raven.Server.Utils;
 using Sparrow.Json;
@@ -65,7 +66,7 @@ public async Task<int> StartMovingShardForId(IDocumentStore store, string id, in
             {
                 try
                 {
-                    await server.ServerStore.Sharding.StartBucketMigration(store.Database, bucket, moveToShard, prefixedSetting?.Prefix);
+                    await server.ServerStore.Sharding.StartBucketMigration(store.Database, bucket, moveToShard, prefix: prefixedSetting?.Prefix, raftId: RaftIdGenerator.NewId());
                     break;
                 }
                 catch