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): consider block timeouts less than 50ms #2455

Merged
merged 3 commits into from
Mar 1, 2024
Merged

fix(worker): consider block timeouts less than 50ms #2455

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17aa2eb
fix(worker): consider block timeouts less than 50ms
roggervalf Feb 28, 2024
5e6eb04
fix: set blockTimeout as 0.001 when reach the time to get new jobs
roggervalf Feb 29, 2024
cedf0ad
chore: add missing types
roggervalf Feb 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
40 changes: 19 additions & 21 deletions src/classes/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,29 +603,27 @@ export class Worker<
0,
);

// Blocking for less than 50ms is useless.
if (blockTimeout > 0.05) {
blockTimeout = this.blockingConnection.capabilities.canDoubleTimeout
? 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);

// 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);

if (result) {
const [_key, member, score] = result;

if (member) {
return parseInt(score);
}
blockTimeout = this.blockingConnection.capabilities.canDoubleTimeout
Copy link
Contributor

@manast manast Feb 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually we must have a blockTimeout that is a positive integer. The reason being that a value of 0 represents infinity, and a negative number would yield an exception. So maybe 1ms would do it? i.e. replace 0.05 by 0.001

? 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);

// 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);

if (result) {
const [_key, member, score] = result;

if (member) {
return parseInt(score);
}
}

return 0;
}
} catch (error) {
Expand Down
Loading