Skip to content

Raise default Chorus local-op timeout so large projects can Send/Receive#359

Closed
myieye wants to merge 1 commit into
developfrom
document-chorus-timeout-env
Closed

Raise default Chorus local-op timeout so large projects can Send/Receive#359
myieye wants to merge 1 commit into
developfrom
document-chorus-timeout-env

Conversation

@myieye

@myieye myieye commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator

Chorus's default 15-minute timeout on local hg operations (notably the post-merge hg commit) is too short for very large projects: the commit runs past 900s and the project lands on hold with a TimeoutException. This recurs for at least one production project (#357), where a maintainer has had to hand-edit environ on the live container — which is wiped on every redeploy.

This bakes the fix into the image:

  • environ: default CHORUS_LOCAL_TIMEOUT_SECONDS to 1800 (30 min) via ${VAR:-1800} — a conservative default that a deployment can raise as needed.
  • lfmergeqm-background.sh / lfmergeqm-looping.sh: add CHORUS_LOCAL_TIMEOUT_SECONDS to the sudo --preserve-env list, so a deployment-supplied value survives the privilege drop to www-data and overrides the default. Without this, an env var set on the container is stripped by sudo and never reaches Chorus.

Closes #357.

Chorus's 15-minute default timeout on local hg operations (e.g. the
post-merge commit) is too short for very large projects, which then land
on hold with a TimeoutException (#357). Default CHORUS_LOCAL_TIMEOUT_SECONDS
to 1800 in environ, and pass it through both lfmergeqm launch scripts'
sudo --preserve-env so a deployment can override it for larger projects.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@myieye myieye force-pushed the document-chorus-timeout-env branch from cbef4a1 to 23e9437 Compare June 2, 2026 10:33
@github-actions

github-actions Bot commented Jun 2, 2026

Copy link
Copy Markdown

Test Results

    2 files    21 suites   4m 25s ⏱️
315 tests 293 ✔️ 22 💤 0
318 runs  296 ✔️ 22 💤 0

Results for commit 23e9437.

@myieye

myieye commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator Author

Closing in favor of #358, which already addresses #357 by setting CHORUS_LOCAL_TIMEOUT_SECONDS in environ. Thanks @rmunn.

@myieye myieye closed this Jun 2, 2026
@myieye myieye deleted the document-chorus-timeout-env branch June 2, 2026 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Increase Chorus timeout by setting env var

1 participant