Skip to content

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

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

Closed
myieye wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions environ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ export PATH="${BASE}/output/${BUILD}/net8.0:${BASE}/output/Mercurial:${PATH}"
# set HGRCPATH so that we ignore ~/.hgrc files which might have content that is
# incompatible with our version of Mercurial
export HGRCPATH=/etc/mercurial/hgrc

# Chorus's 15-min default timeout on local hg ops is too short for very large
# projects, whose merge commits can exceed it and land the project on hold
# (https://github.com/sillsdev/LfMerge/issues/357). Overridable per deployment via
# CHORUS_LOCAL_TIMEOUT_SECONDS, passed through by the launch scripts' --preserve-env.
export CHORUS_LOCAL_TIMEOUT_SECONDS=${CHORUS_LOCAL_TIMEOUT_SECONDS:-1800}
2 changes: 1 addition & 1 deletion lfmergeqm-background.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

while :
do
sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
sudo -H --preserve-env=CHORUS_HG_EXE,CHORUS_LOCAL_TIMEOUT_SECONDS -u www-data lfmergeqm
sleep 86400
done
4 changes: 2 additions & 2 deletions lfmergeqm-looping.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trap "exit" TERM
# This is expected to run as the CMD, launched by the entry point.

while inotifywait -e close_write /var/lib/languageforge/lexicon/sendreceive/syncqueue; do
sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
sudo -H --preserve-env=CHORUS_HG_EXE,CHORUS_LOCAL_TIMEOUT_SECONDS -u www-data lfmergeqm
# Run it again just to ensure that any initial clones that missed a race condition have a chance to get noticed
sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
sudo -H --preserve-env=CHORUS_HG_EXE,CHORUS_LOCAL_TIMEOUT_SECONDS -u www-data lfmergeqm
done
Loading