Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions lib/cluster/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@ class Cluster<
this.shardedSubscribers.stop();
}

if (status === "wait") {
// No node is left to emit "drain" while reconnecting.
if (status === "wait" || (status === "reconnecting" && !reconnect)) {
this.setStatus("close");
this.handleCloseEvent();
} else {
Expand Down Expand Up @@ -471,7 +472,7 @@ class Cluster<
this.shardedSubscribers.stop();
}

if (status === "wait") {
if (status === "wait" || status === "reconnecting") {
const ret = asCallback(Promise.resolve<"OK">("OK"), callback);

// use setImmediate to make sure "close" event
Expand Down
40 changes: 40 additions & 0 deletions test/functional/cluster/disconnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,44 @@ describe("disconnection", () => {
"Connection is closed."
);
});

["disconnect", "quit"].forEach((method) => {
it(`should end when ${method}() is called while reconnecting`, async () => {
const server = new MockServer(30000, () => {}, [
[0, 16383, ["127.0.0.1", 30000]],
]);
const cluster = new Cluster([{ host: "127.0.0.1", port: "30000" }], {
clusterRetryStrategy: () => 1000,
});
await new Promise((resolve) => cluster.once("ready", resolve));

server.disconnect();
await new Promise((resolve) => cluster.once("reconnecting", resolve));
await cluster[method]();
await new Promise((resolve) => setImmediate(resolve));

expect(cluster.status).to.equal("end");
await expect(cluster.get("foo")).to.be.rejectedWith(
"Connection is closed."
);
});
});

it("should not retry again when disconnect(true) is called while reconnecting", async () => {
const server = new MockServer(30000, () => {}, [
[0, 16383, ["127.0.0.1", 30000]],
]);
const clusterRetryStrategy = sinon.spy(() => 1000);
const cluster = new Cluster([{ host: "127.0.0.1", port: "30000" }], {
clusterRetryStrategy,
});
await new Promise((resolve) => cluster.once("ready", resolve));

server.disconnect();
await new Promise((resolve) => cluster.once("reconnecting", resolve));
cluster.disconnect(true);

expect(clusterRetryStrategy.callCount).to.equal(1);
cluster.disconnect();
});
});
Loading