Re: [PATCH 0/3] fixing expensive http test timeouts
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jun 29, 2026, 07:33 UTC
- Message-ID
- <akIfsaVMB_S6kfJQ@pks.im>
- In-Reply-To
- <20260628075716.GA3525066@coredump.intra.peff.net>
On Sun, Jun 28, 2026 at 03:57:16AM -0400, Jeff King wrote:
Show 26 quoted lines
> On Fri, Jun 26, 2026 at 04:26:28PM -0700, Michael Montalbo wrote: > > > I think Peff and Patrick's suggestion to just increase the Apache timeout > > makes sense. I ran some experiments using a really long timeout with an > > artificially slowed down CI runner and all the jobs made progress > > (if slowly) without stalling, and eventually completed successfully: > > > > https://github.com/mmontalbo/git/actions/runs/28267019651 > > > > I haven't spent a lot of time trying to figure out what the right timeout > > value should be. An hour definitely seems like overkill, with something > > on the order of 5-10 minutes seeming more reasonable, but I don't > > have a principled number. > > Here are some patches to keep things moving along. I arbitrarily picked > 10 minutes, because multiplying the 1-minute default by 10 felt right. ;) > > The first one just bumps the timeout and should make our problems go > away. The other two are optimizations, but I'm on the fence on whether > the final patch is worth it. > > Thanks again for all of the digging. > > [1/3]: t/lib-httpd: bump apache timeout > [2/3]: t5551: put many-tags case into its own repo > [3/3]: t5551: pack refs after creating many tags
By the way, the only reason why we at GitLab haven't been feeling the pain is that we only enable GIT_TEST_LONG for GitHub. So I was wondering whether we want to have something like the below patch on top.
Patrick
diff --git a/ci/lib.sh b/ci/lib.sh index b939110a6e..57801586aa 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -215,6 +215,14 @@ then test macos != "$CI_OS_NAME" || CI_OS_NAME=osx CI_REPO_SLUG="$GITHUB_REPOSITORY" CI_JOB_ID="$GITHUB_RUN_ID" + + case "$GITHUB_EVENT_NAME" in + pull_request) + CI_EVENT=pull_request;; + push) + CI_EVENT=push;; + esac + CC="${CC_PACKAGE:-${CC:-gcc}}" DONT_SKIP_TAGS=t handle_failed_tests () { @@ -239,6 +247,13 @@ then CI_BRANCH="$CI_COMMIT_REF_NAME" CI_COMMIT="$CI_COMMIT_SHA" + case "$CI_PIPELINE_SOURCE" in + merge_request_event) + CI_EVENT=pull_request;; + push) + CI_EVENT=push;; + esac + case "$OS,$CI_JOB_IMAGE" in Windows_NT,*) CI_OS_NAME=windows @@ -319,7 +334,7 @@ export SKIP_DASHED_BUILT_INS=YesPlease # enable "expensive" tests for PR events. # In order to catch bugs introduced at integration time by mismerges, # enable the long tests for pushes to the integration branches as well. -case "$GITHUB_EVENT_NAME,$CI_BRANCH" in +case "$CI_EVENT,$CI_BRANCH" in pull_request,*|push,*next*|push,*master*|push,*main*|push,*maint*) export GIT_TEST_LONG=YesPlease ;;