Skip to content
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

fix(worker): force timeout on bzpopmin command #2543

Merged
merged 6 commits into from
Apr 30, 2024
Merged

fix(worker): force timeout on bzpopmin command #2543

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1e0281
fix(worker): force timeout on bzpopmin command
manast Apr 25, 2024
32a1c7d
Merge branch 'master' into fix/force-timeout-for-bzpopmin
manast Apr 25, 2024
a7fa029
chore: upgrade ioredis to v5.4.1
manast Apr 25, 2024
a2dab8f
chore: fix merge conflicts
roggervalf Apr 27, 2024
dbb7f48
Merge branch 'master' of https://github.com/taskforcesh/bullmq into f…
manast Apr 29, 2024
a0c28b4
Merge branch 'fix/force-timeout-for-bzpopmin' of https://github.com/t…
manast Apr 29, 2024
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"dependencies": {
"cron-parser": "^4.6.0",
"ioredis": "^5.3.2",
"ioredis": "^5.4.1",
"msgpackr": "^1.10.1",
"node-abort-controller": "^3.1.1",
"semver": "^7.5.4",
Expand Down
15 changes: 15 additions & 0 deletions src/classes/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,10 +625,25 @@ will never work with more accuracy than 1ms. */
? blockTimeout
: Math.ceil(blockTimeout);

// We restrict the maximum block timeout to 10 second to avoid
// blocking the connection for too long in the case of reconnections
// reference: https://github.com/taskforcesh/bullmq/issues/1658
blockTimeout = Math.min(blockTimeout, maximumBlockTimeout);
manast marked this conversation as resolved.
Show resolved Hide resolved

// We cannot trust that the blocking connection stays blocking forever
// due to issues in Redis and IORedis, so we will reconnect if we
// don't get a response in the expected time.
const timeout = setTimeout(async () => {
await this.blockingConnection.disconnect();
await this.blockingConnection.reconnect();
}, blockTimeout * 1000 + 1000);

this.updateDelays(); // reset delays to avoid reusing same values in next iteration

// Markers should only be used for un-blocking, so we will handle them in this
// function only.
const result = await bclient.bzpopmin(this.keys.marker, blockTimeout);
clearTimeout(timeout);

if (result) {
const [_key, member, score] = result;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3910,10 +3910,10 @@ into-stream@^6.0.0:
from2 "^2.3.0"
p-is-promise "^3.0.0"

ioredis@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7"
integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==
ioredis@^5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.4.1.tgz#1c56b70b759f01465913887375ed809134296f40"
integrity sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==
dependencies:
"@ioredis/commands" "^1.1.1"
cluster-key-slot "^1.1.0"
Expand Down
Loading