Skip to content

fix(test): raise timeout for cluster PubSub listener-move test #3357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nkaradzhov wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −14
Open

fix(test): raise timeout for cluster PubSub listener-move test #3357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56fc997
test(client): raise timeout for cluster PubSub listener-move test
nkaradzhov Jul 22, 2026
a8c075f
test(client): fix cluster PubSub listener-move test timeout
nkaradzhov Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions packages/client/lib/cluster/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ describe('Cluster', () => {
cluster.nodeClient(importing)
]);

const range = cluster.slots[0].master === migrating ? {
const range = cluster.slots[0].master.address === migrating.address ? {
key: 'bar', // 5061
start: 0,
end: 8191
Expand All @@ -400,18 +400,21 @@ describe('Cluster', () => {
end: 16383
};

// reassigning slots with `CLUSTER SETSLOT .. NODE` can leave the nodes in a
// transient `cluster_state:fail` state, so claim the slots on the importing
// node first, then release them on the migrating node, and wait for both
// nodes to report a healthy cluster before going on
const importingPromises: Array<Promise<unknown>> = [],
migratingPromises: Array<Promise<unknown>> = [];
for (let i = range.start; i <= range.end; i++) {
importingPromises.push(importingClient.clusterSetSlot(i, 'NODE', importing.id));
migratingPromises.push(migratingClient.clusterSetSlot(i, 'NODE', importing.id));
}
await Promise.all(importingPromises);
await Promise.all(migratingPromises);
// Reassign the whole slot range in one shot with DEL/ADDSLOTSRANGE
// instead of thousands of per-slot `CLUSTER SETSLOT .. NODE` calls,
// which overflowed the test timeout on slow CI runners. Release the
// range on both nodes first (`CLUSTER ADDSLOTS` rejects a slot that is
// still assigned in the node's own cluster view, and gossip has not yet
// propagated the migrating node's release to the importing node), then
// claim it on the importing node, then wait for both nodes to reconverge
// to a healthy cluster before going on (the reassignment leaves a
// transient `cluster_state:fail` window).
const slotRange = { start: range.start, end: range.end };
await Promise.all([
migratingClient.clusterDelSlotsRange(slotRange),
importingClient.clusterDelSlotsRange(slotRange)
]);
await importingClient.clusterAddSlotsRange(slotRange);

for (const client of [migratingClient, importingClient]) {
while (!(await client.clusterInfo()).startsWith('cluster_state:ok')) {
Expand All @@ -431,7 +434,10 @@ describe('Cluster', () => {
}, {
serverArguments: [],
numberOfMasters: 2,
minimumDockerVersion: [7]
minimumDockerVersion: [7],
// range reassignment plus polling both nodes for `cluster_state:ok` can
// exceed mocha's default 2000ms on slow CI runners
testTimeout: 30000
});

testUtils.testWithCluster('ssubscribe & sunsubscribe', async cluster => {
Expand Down
2 changes: 2 additions & 0 deletions packages/test-utils/lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ interface CommonTestOptions {
serverArguments: Array<string>;
minimumDockerVersion?: Array<number>;
skipTest?: boolean;
testTimeout?: number;
}

interface ClientTestOptions<
Expand Down Expand Up @@ -886,6 +887,7 @@ export default class TestUtils {
}

it(title, async function () {
if (options.testTimeout) this.timeout(options.testTimeout);
if (options.skipTest) return this.skip();
if (!dockersPromise) return this.skip();
const RESP = (options.clusterConfiguration?.RESP ?? DEFAULT_RESP) as RESP;
Expand Down