Skip to content

Commit 4e40202

Browse files
committed
ensure get slots parsing deals with unstable slots
1 parent 0975467 commit 4e40202

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

libs/host/GarnetServer.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,13 @@ private void InternalDispose()
438438
for (var i = 0; i < servers.Length; i++)
439439
servers[i]?.Close();
440440

441-
// Phase 2: Dispose the provider (storage engine shutdown — may take time).
442-
Provider?.Dispose();
443-
444-
// Phase 3: Drain active handlers and clean up remaining resources.
441+
// Phase 2: Drain active handlers and clean up remaining resources.
445442
for (var i = 0; i < servers.Length; i++)
446443
servers[i]?.Dispose();
444+
445+
// Phase 3: Dispose the provider (storage engine shutdown — may take time).
446+
Provider?.Dispose();
447+
447448
subscribeBroker?.Dispose();
448449
storeEpoch?.Dispose();
449450
aofEpoch?.Dispose();

test/Garnet.test.cluster/ClusterTestUtils.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,10 @@ public List<int> GetOwnedSlotsFromNode(IPEndPoint endPoint, ILogger logger)
15301530
{
15311531
for (int i = (int)ClusterInfoTag.SLOT; i < nodeInfo.Length; i++)
15321532
{
1533+
// Skip migration/import markers like [slot->-nodeId] and [slot-<-nodeId]
1534+
if (nodeInfo[i].StartsWith('['))
1535+
continue;
1536+
15331537
var range = nodeInfo[i].Split('-');
15341538
if (!ushort.TryParse(range[0], out var slotStart))
15351539
Assert.Fail($"GetOwnedSlotsFromNode: {range[0]}");

0 commit comments

Comments
 (0)