Skip to content

[bp/1.36] Flakes stack#44684

Closed
Copilot wants to merge 9 commits intorelease/v1.36from
copilot/backport-flake-fix-to-release-v1-36
Closed

[bp/1.36] Flakes stack#44684
Copilot wants to merge 9 commits intorelease/v1.36from
copilot/backport-flake-fix-to-release-v1-36

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 27, 2026

Backport of the flake-fix stack from #44644 ([bp/1.37] Flakes stack) to release/v1.36.

Cherry-picks the following 8 upstream commits in order:

One conflict resolved: changelogs/current.yaml — retained only the load_report bug-fix entry relevant to 1.36.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • https://api.github.com/repos/envoyproxy/envoy/pulls/44684
    • Triggering command: /usr/bin/curl curl -s -X PATCH -H Authorization: token ****** -H Accept: application/vnd.github.v3+json REDACTED -d {"title": "[bp/1.36] Flakes stack", "draft": false} (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Original prompt

Backport the flake-fix stack from PR #44644 (which targeted release/v1.37) to release/v1.36.

Cherry-pick the following 8 upstream commits in order from main onto release/v1.36:

  1. 1b7af978b8819e08d2a804556d2ca52d77a0169c — test: Fix ws integration test flake (test: Fix ws integration test flake #44508)
  2. 095e13d2740727c31e781f7abc4fb67ab1dd04ac — test/ws: Follow up fixes from test: Fix ws integration test flake #44508 (test/ws: Follow up fixes from #44508 #44518)
  3. (the squash-merge commit for test/ws: Increase sharding further #44529) — test/ws: Increase sharding further (test/ws: Increase sharding further #44529)
  4. 080522bf396dd344fe28dfc98c29eea4e7fab012 — test/idle_timeout: Fix flake (test/idle_timeout: Fix flake #44584)
  5. (the squash-merge commit for quic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStream #44500) — quic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStream (quic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStream #44500)
  6. (the squash-merge commit for test: Attempt to fix flake in grpc transcoder test #44510) — test: Attempt to fix flake in grpc transcoder test (test: Attempt to fix flake in grpc transcoder test #44510)
  7. (the squash-merge commit for lrs: proper shutdown of the LRS stream #43083) — lrs: proper shutdown of the LRS stream (lrs: proper shutdown of the LRS stream #43083)
  8. (the squash-merge commit for dns test: improve tests by teardown the server and upstream #43711) — dns test: improve tests by teardown the server and upstream (dns test: improve tests by teardown the server and upstream #43711)

You can find the exact merge SHAs by looking at the commits in phlax:bp-1.37-flakes (the source branch of #44644), which has these same 8 commits cherry-picked onto release/v1.37. The list of those commits is available via the GitHub API at /repos/envoyproxy/envoy/pulls/44644/commits.

Verification done already against release/v1.36:

Workflow:

  1. Create a branch bp-1.36-flakes from release/v1.36.
  2. Cherry-pick the 8 commits in the order listed.
  3. Resolve any trivial conflicts (changelog entries — the 1.36 changelog is in changelogs/current.yaml for the 1.36 dev cycle; if the LRS bug-fix entry doesn't apply cleanly, simply add the load_report bug_fixes entry under the appropriate section).
  4. Push and open a PR titled [bp/1.36] Flakes stack against base release/v1.36.
  5. Add label backport/review if available, otherwise use whatever the standard backport label is for this repo (check existing recent [bp/1.36] PRs for reference, e.g. PR [bp/1.36] test: Updating integration tests certificate and creation script  #44363 / [bp/1.36] router: fix a bug where internal redirect will hang up request or unexpected redirect (#44154) #44303 / [bp/1.36] dym: fix a bug where part of body maynot be sent to upstream (#44081) #44084).
  6. PR body should briefly list the 8 cherry-picked PRs and link to [bp/1.37] Flakes stack #44644 as the corresponding 1.37 backport.

Do NOT open any issues. Just the PR.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: this backported a load of flakes to 1.37 - wondering if all are correct/needed/fix somethign etc? for other supported branches - 1.35 and 1.36 (release/v{x})

Assistant: ## Summary of [bp/1.37] Flakes stack (#44644)

The PR backported 8 upstream commits to release/v1.37. Here they are with applicability to release/v1.36 and release/v1.35:

# Upstream PR Change Risk Fixes / motivation
1 #44508 test: Fix ws integration test flake — fixes 200ms timeout race + drops cpu:3/large size in test/integration/BUILD test-only reduce flakes in websocket_integration_test
2 #44518 test/ws: Follow up fixes from #44508 test-only follow up to #44508
3 #44529 test/ws: Increase sharding further test-only still flaking under MSAN
4 #44584 test/idle_timeout: Fix flake — scale RequestTimeoutMs by TIMEOUT_FACTOR test-only fixes #26979 (long-standing)
5 #44500 quic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStream source, low risk (removes an ASSERT) fixes #41526 — flakes in buffer_accounting_integration_test MSAN
6 #44510 test: Attempt to fix flake in grpc transcoder test — split a combined test test-only fixes #44427
7 #43083 lrs: proper shutdown of the LRS stream — adds ~LoadStatsReporter to disable timers + reset stream source, moderate risk (real bug fix) LRS stream shutdown race with ADS
8 #43711 dns test: improve tests by teardown the server and upstream test-only improves s...

This pull request was created from Copilot chat.

@repokitteh-read-only
Copy link
Copy Markdown

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #44684 was opened by Copilot.

see: more, trace.

phlax and others added 8 commits April 27, 2026 18:43
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
as this can still flake in msan

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Scale RequestTimeoutMs by TIMEOUT_FACTOR to match IdleTimeoutMs. The
hard-coded 200ms races test setup on loaded/sanitizer runs, causing the
request timer to fire before the test body executes.

fix #26979

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
#44500)

QuicSpdyClientSession::ShouldCreateOutgoingBidirectionalStream() can
legitimately return false, but we return true unconditionally to avoid a
nullptr deref in QuicHttpClientConnectionImpl::newStream.

The existing ASSERT on the parent's return value was therefore incorrect
and triggered flakes (e.g. in buffer_accounting_integration_test on
MSAN). Drop the ASSERT and update the comment.

Fixes #41526

---------

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
by separating the tests

Hopefully fix: #44427

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
Copilot AI mentioned this pull request Apr 27, 2026
Copilot AI changed the title [WIP] Cherry-pick flake-fix stack to release/v1.36 [bp/1.36] Flakes stack Apr 27, 2026
Copilot AI requested a review from phlax April 27, 2026 18:48
@phlax phlax closed this Apr 27, 2026
@phlax phlax deleted the copilot/backport-flake-fix-to-release-v1-36 branch April 30, 2026 21:09
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.

4 participants