-
Notifications
You must be signed in to change notification settings - Fork 598
fix: orchestrator enqueue yield #21286
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundatio | |
| import { promiseWithResolvers } from '@aztec/foundation/promise'; | ||
| import { SerialQueue } from '@aztec/foundation/queue'; | ||
| import { assertLength } from '@aztec/foundation/serialize'; | ||
| import { sleep } from '@aztec/foundation/sleep'; | ||
| import { pushTestData } from '@aztec/foundation/testing'; | ||
| import { elapsed } from '@aztec/foundation/timer'; | ||
| import type { TreeNodeLocation } from '@aztec/foundation/trees'; | ||
|
|
@@ -634,9 +635,11 @@ export class ProvingOrchestrator implements EpochProver { | |
| } | ||
| }; | ||
|
|
||
| // Enqueue onto the serial queue with limited workers to avoid starving the event loop. | ||
| // Workers yield between jobs via await, allowing I/O callbacks to process. | ||
| void this.deferredJobQueue.put(() => safeJob()); | ||
| void this.deferredJobQueue.put(async () => { | ||
| void safeJob(); | ||
| // we yield here to the macro task queue such to give Nodejs a chance to run other operatoins in between enqueues | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't really understand this change. Doesn't this negate the purpose of having a queue and effectively take us back to |
||
| await sleep(0); | ||
| }); | ||
| } | ||
|
|
||
| private async updateL1ToL2MessageTree(l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can also do await safeJob() but I guess you'd have to fight the linter. (any await yields)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awaiting here would introduce a limit on how many proofs we have in flight at a time. We want to use fire-and-forget here and use callbacks to continue up the rollup