fix count of rooms with deletion priority

topfreegames · Feb 14, 2023 · b953270 · b953270
1 parent 292d04a
commit b953270
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/internal/core/services/rooms/room_manager.go b/internal/core/services/rooms/room_manager.go
@@ -234,6 +234,11 @@ func (m *RoomManager) ListRoomsWithDeletionPriority(ctx context.Context, schedul
 	var toDeleteRooms []*game_room.GameRoom
 	var terminatingRooms []*game_room.GameRoom
 	for _, roomID := range schedulerRoomsIDs {
+
+		if len(toDeleteRooms)+len(terminatingRooms) == amount {
+			break
+		}
+
 		room, err := m.RoomStorage.GetRoom(ctx, schedulerName, roomID)
 		if err != nil {
 			if !errors.Is(err, porterrors.ErrNotFound) {
@@ -260,9 +265,6 @@ func (m *RoomManager) ListRoomsWithDeletionPriority(ctx context.Context, schedul
 		}
 
 		toDeleteRooms = append(toDeleteRooms, room)
-		if len(toDeleteRooms) == amount {
-			break
-		}
 	}
 
 	result := append(toDeleteRooms, terminatingRooms...)

diff --git a/internal/core/services/rooms/room_manager_test.go b/internal/core/services/rooms/room_manager_test.go
@@ -628,6 +628,10 @@ func TestRoomManager_ListRoomsWithDeletionPriority(t *testing.T) {
 		ctx := context.Background()
 		schedulerName := "test-scheduler"
 		ignoredVersion := "v1.2.3"
+		expectedRooms := []*game_room.GameRoom{
+			{ID: "first-room", SchedulerID: schedulerName, Status: game_room.GameStatusReady, Version: "v1.1.1"},
+			{ID: "second-room", SchedulerID: schedulerName, Status: game_room.GameStatusTerminating, Version: "v1.1.1"},
+		}
 		availableRooms := []*game_room.GameRoom{
 			{ID: "first-room", SchedulerID: schedulerName, Status: game_room.GameStatusReady, Version: "v1.1.1"},
 			{ID: "second-room", SchedulerID: schedulerName, Status: game_room.GameStatusTerminating, Version: "v1.1.1"},
@@ -639,11 +643,11 @@ func TestRoomManager_ListRoomsWithDeletionPriority(t *testing.T) {
 
 		roomStorage.EXPECT().GetRoom(ctx, schedulerName, availableRooms[0].ID).Return(availableRooms[0], nil)
 		roomStorage.EXPECT().GetRoom(ctx, schedulerName, availableRooms[1].ID).Return(availableRooms[1], nil)
-		roomStorage.EXPECT().GetRoom(ctx, schedulerName, availableRooms[2].ID).Return(availableRooms[2], nil)
 
 		rooms, err := roomManager.ListRoomsWithDeletionPriority(ctx, schedulerName, ignoredVersion, 2, roomsBeingReplaced)
 		require.NoError(t, err)
-		require.Equal(t, availableRooms, rooms)
+		require.Equal(t, expectedRooms, rooms)
+		require.Len(t, rooms, 2)
 	})
 }