fix: wait for all jobs to be completed before running AfterImportJob #3992
Conversation
This file contains 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
This comment was marked as resolved.
This comment was marked as resolved.
dammy001
reviewed
Sep 25, 2023
src/ChunkReader.php
Outdated
| @@ -84,7 +83,8 @@ public function read(WithChunkReading $import, Reader $reader, TemporaryFile $te | |||
| $afterImportJob = new AfterImportJob($import, $reader); | |||
|
|
|||
| if ($import instanceof ShouldQueueWithoutChain) { | |||
| $jobs->push($afterImportJob->delay($delayCleanup)); | |||
| $afterImportJob->setDependencies($jobs); | |||
| $jobs->push($afterImportJob->delay(60)); | |||
There was a problem hiding this comment.
why remove the $delayCleanup? I think it should be changeable from userland
There was a problem hiding this comment.
Because it was just added as an undocumented workaround to run the cleanup only after 100 minutes (which is an assumption on when all jobs should have finished), with this PR, which fixes the underlying issue it becomes unnecessary and would actually interfer with the fix if people forget to remove it, so if we leave the option to change the interval, it should be a differently named option, but I simply don't think it's necessary anymore
There was a problem hiding this comment.
I think we should give it another name so it can be changed instead of a constant delay of 60
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #3560
By storing a list of ids in the cache when creating the jobs, that we delete one by one when the job completes, we retry the AfterImportJob every 60 seconds and check that all jobs have completed