Repository navigation
Wait for merges to finish after extraction - #452
Draft
oliver-kriska wants to merge 1 commit into
Draft
oliver-kriska wants to merge 1 commit into
oliver-kriska wants to merge 1 commit into
Conversation
Match standalone gettext.merge by waiting without a fixed timeout in the shared extract/generate post-processing path. Large catalogs can exceed the previous 120-second deadline even when the merge is making progress.
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
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.
Remove the 120-second timeout around the merge tasks launched by
gettext.extract --mergeandgettext.generate --merge. Both use the same extraction post-processing path. Standalonegettext.mergealready waits indefinitely for its merge tasks.Fixes #440 and follows José's suggestion there to use
:infinity. Faster fuzzy matching helps but cannot make a fixed deadline safe for every catalog. A stalled merge still needs to be interrupted by the user or the enclosing CI job's timeout; this change does not make file updates transactional.Validation:
process/4entry point and real merge task with a public plural callback that delayed completion for 122 seconds. The original code exited with the stream timeout at 120.001 seconds. The changed code completed at 122.009 seconds and preserved the PO translation.mix test --warnings-as-errors: 193 passed (5 doctests, 188 tests), including the existing extract/generate/merge integration tests.The two-minute boundary probe was temporary validation, not a permanent two-minute addition to the test suite. No configuration option or other merge behavior changes are introduced.