Skip to content
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.

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

TcpProxy::CombinedUpstream: Implement watermark functions #34098

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from

Conversation

vikaschoudhary16
Copy link
Contributor

followup to #32991
Commit Message: Implement watermark functions which was a TODO and some cleanup
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
@vikaschoudhary16
Copy link
Contributor Author

/assign @alyssawilk

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
@vikaschoudhary16 vikaschoudhary16 marked this pull request as ready for review May 11, 2024 11:48
@vikaschoudhary16 vikaschoudhary16 marked this pull request as draft May 11, 2024 14:38
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
@vikaschoudhary16 vikaschoudhary16 marked this pull request as ready for review May 11, 2024 15:39
void onDecoderFilterAboveWriteBufferHighWatermark() override {}
void onDecoderFilterBelowWriteBufferLowWatermark() override {}
void onDecoderFilterAboveWriteBufferHighWatermark() override {
parent_->upstream_callbacks_->onAboveWriteBufferHighWatermark();
Copy link
Contributor

Choose a reason for hiding this comment

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

Mind adding the e2e backup tests along with this change?
grep FlowControl test/integration/* has some examples
/wait

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
@@ -64,6 +65,9 @@ class StopIterationAndContinueFilter : public Http::PassThroughFilter {
if (end_stream) {
setEndStreamAndDecodeTimer();
}
if (stop_and_buffer_) {
return Http::FilterDataStatus::StopIterationAndBuffer;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If this change is not added, assertion fails in tcp_proxy.cc

 // The upstream should consume all of the data.
  // Before there is an upstream the connection should be readDisabled. If the upstream is
  // destroyed, there should be no further reads as well.
  ASSERT(0 == data.length());

Why we dont need this assertion in HCM case and it is there only in tcp_proxy?

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
@vikaschoudhary16 vikaschoudhary16 marked this pull request as draft May 25, 2024 02:21
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
This reverts commit 2196563.

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
This reverts commit 9b7bc61.

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
This reverts commit 148ca65.

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
This reverts commit 201f6b5.

Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
Signed-off-by: Vikas Choudhary <choudharyvikas16@gmail.com>
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.

None yet

2 participants