Updating DB IDs after swap

microsoft · Mar 8, 2025 · 62159e6 · 62159e6
1 parent 6e9d4c8
commit 62159e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/libs/server/Databases/MultiDatabaseManager.cs b/libs/server/Databases/MultiDatabaseManager.cs
@@ -581,6 +581,9 @@ public override bool TrySwapDatabases(int dbId1, int dbId2)
                 databaseMapSnapshot[dbId1] = db2;
                 databaseMapSnapshot[dbId2] = tmp;
 
+                databaseMapSnapshot[dbId1].Id = dbId1;
+                databaseMapSnapshot[dbId2].Id = dbId2;
+
                 var sessions = StoreWrapper.TcpServer?.ActiveConsumers().ToArray();
                 if (sessions == null) return true;
                 if (sessions.Length > 1) return false;

diff --git a/libs/server/Resp/RespServerSession.cs b/libs/server/Resp/RespServerSession.cs
@@ -1330,6 +1330,9 @@ internal bool TrySwapDatabaseSessions(int dbId1, int dbId2)
             databaseSessions.Map[dbId1] = dbSession2;
             databaseSessions.Map[dbId2] = tmp;
 
+            databaseSessions.Map[dbId1].Id = dbId1;
+            databaseSessions.Map[dbId2].Id = dbId2;
+
             if (activeDbId == dbId1)
                 SwitchActiveDatabaseSession(dbId1, ref databaseSessions.Map[dbId1]);
             else if (activeDbId == dbId2)