Skip to content

drain_manager: Unclean Revert of "HTTP2 Proactive GOAWAY on Drain - Preamble (#17026)"#37465

Merged
alyssawilk merged 3 commits intoenvoyproxy:mainfrom
alyssawilk:drain
Dec 9, 2024
Merged

drain_manager: Unclean Revert of "HTTP2 Proactive GOAWAY on Drain - Preamble (#17026)"#37465
alyssawilk merged 3 commits intoenvoyproxy:mainfrom
alyssawilk:drain

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

This reverts commit 96dd735.

96dd735
was a precursor to
#16201
which never landed.

Unwinding the change
envoyproxy/envoy-mobile#176

@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: #37465 was opened by alyssawilk.

see: more, trace.

@alyssawilk alyssawilk force-pushed the drain branch 2 times, most recently from ec49975 to 58f7f08 Compare December 2, 2024 21:03

ASSERT(!drain_tick_timer_);
const std::chrono::seconds drain_delay(server_.options().drainTime());
drain_tick_timer_ = server_.dispatcher().createTimer(drain_complete_cb);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting that at 96dd735, we used to set draining_ = true -- is that not necessary in the revert? I see the field still exists.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting it down on line 83 to preserve the (maybe not even relevant) fix in #31452
hence the unclean revert

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry, missed that.

zuercher
zuercher previously approved these changes Dec 4, 2024
@alyssawilk alyssawilk merged commit 072831e into envoyproxy:main Dec 9, 2024
yanavlasov added a commit to yanavlasov/envoy that referenced this pull request Feb 6, 2025
yanavlasov added a commit that referenced this pull request Feb 11, 2025
…rain - Preamble (#17026)" (#37465)" (#38333)

Commit Message:
This reverts commit 072831e.

Revert in PR-37465 created problems for boundary proxy for Google
partner cloud, as it depends on the reverted internal API
`addOnDrainCloseCb`. Boundary proxy is open source and Google cloud
partners will be unable to build OSS version, since it depends on OSS
Envoy.

Putting back the reverted code for now, as it is unclear what exactly
can be removed from Envoy at this point.

Risk Level: Low
Testing: Unit tests
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

---------

Signed-off-by: Yan Avlasov <[email protected]>
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.

2 participants