[bp/1.36] Flakes stack#44684
Closed
Copilot wants to merge 9 commits intorelease/v1.36from
Closed
Conversation
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
changed the title
[WIP] Cherry-pick flake-fix stack to release/v1.36
[bp/1.36] Flakes stack
Apr 27, 2026
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.
Backport of the flake-fix stack from #44644 (
[bp/1.37] Flakes stack) torelease/v1.36.Cherry-picks the following 8 upstream commits in order:
test: Fix ws integration test flake— dropcpu:3/largesize, fix 200ms timeout racetest/ws: Follow up fixes from #44508test/ws: Increase sharding further— shard count 8 under MSANtest/idle_timeout: Fix flake— scaleRequestTimeoutMsbyTIMEOUT_FACTORShouldCreateOutgoingBidirectionalStream#44500 —quic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStream— removes crash-prone ASSERT, returnstrueunconditionallytest: Attempt to fix flake in grpc transcoder test— splitDisableRequestValidationinto three independent parameterized testslrs: proper shutdown of the LRS stream— adds~LoadStatsReporterdestructor to disable timers and reset stream, fixes shutdown race with ADS; also explicitly resetsload_stats_reporter_before clearing clusters inClusterManagerImpldns test: improve tests by teardown the server and upstream— addsTearDown()toDnsFilterIntegrationTestOne conflict resolved:
changelogs/current.yaml— retained only theload_reportbug-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/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) torelease/v1.36.Cherry-pick the following 8 upstream commits in order from
mainontorelease/v1.36:1b7af978b8819e08d2a804556d2ca52d77a0169c— test: Fix ws integration test flake (test: Fix ws integration test flake #44508)095e13d2740727c31e781f7abc4fb67ab1dd04ac— test/ws: Follow up fixes from test: Fix ws integration test flake #44508 (test/ws: Follow up fixes from #44508 #44518)080522bf396dd344fe28dfc98c29eea4e7fab012— test/idle_timeout: Fix flake (test/idle_timeout: Fix flake #44584)ShouldCreateOutgoingBidirectionalStream#44500) — quic: Remove flaky ASSERT inShouldCreateOutgoingBidirectionalStream(quic: Remove flaky ASSERT inShouldCreateOutgoingBidirectionalStream#44500)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 ontorelease/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:test/integration/idle_timeout_integration_test.ccstill hasRequestTimeoutMs = 200;(no* TIMEOUT_FACTOR) — test/idle_timeout: Fix flake #44584 applies.source/common/quic/envoy_quic_client_session.hstill has the flakyASSERT(quic::QuicSpdyClientSession::ShouldCreateOutgoingBidirectionalStream())— quic: Remove flaky ASSERT inShouldCreateOutgoingBidirectionalStream#44500 applies.source/common/upstream/load_stats_reporter.hhas no~LoadStatsReporterdestructor — lrs: proper shutdown of the LRS stream #43083 applies.test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cchas the same fixture structure as 1.37 — dns test: improve tests by teardown the server and upstream #43711 applies.Workflow:
bp-1.36-flakesfromrelease/v1.36.changelogs/current.yamlfor the 1.36 dev cycle; if the LRS bug-fix entry doesn't apply cleanly, simply add theload_reportbug_fixes entry under the appropriate section).[bp/1.36] Flakes stackagainst baserelease/v1.36.backport/reviewif 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).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 torelease/v1.36andrelease/v1.35:test: Fix ws integration test flake— fixes 200ms timeout race + dropscpu:3/large size intest/integration/BUILDwebsocket_integration_testtest/ws: Follow up fixes from #44508test/ws: Increase sharding furthertest/idle_timeout: Fix flake— scaleRequestTimeoutMsbyTIMEOUT_FACTORquic: Remove flaky ASSERT in ShouldCreateOutgoingBidirectionalStreambuffer_accounting_integration_testMSANtest: Attempt to fix flake in grpc transcoder test— split a combined testlrs: proper shutdown of the LRS stream— adds~LoadStatsReporterto disable timers + reset streamdns test: improve tests by teardown the server and upstreamThis pull request was created from Copilot chat.