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.

Sign up for GitHub

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

Jump to bottom

server: Change proxyprotocol to lazy mode #36301

Merged
merged 16 commits into from
Aug 11, 2022
Merged

server: Change proxyprotocol to lazy mode #36301

merged 16 commits into from
Aug 11, 2022

Conversation

blacktear23
Copy link
Contributor

@blacktear23 blacktear23 commented Jul 19, 2022 •
edited by xhebox
Loading

What problem does this PR solve?

Issue Number: ref #36312

Problem Summary:

As using AWS NLB and enable PROXY protocol v2 (PPv2) NLB will not send PPv2 header data until client send data to server. This will trigger go-proxyprotocol raise timeout error and client cannot handshake with server.

What is changed and how it works?

This PR will use new version of go-proxyprotocol and set the mode to lazy. Then the PPv2 header will be handled when the first Read function call. That will allow TiDB server can send handshake packet before NLB send PPv2 header.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Support AWS NLB proxy protocol

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 19, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 19, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@blacktear23 blacktear23 changed the title [WIP] Change proxyprotocol to lazy mode [WIP] [server] Change proxyprotocol to lazy mode Jul 19, 2022
@blacktear23 blacktear23 changed the title [WIP] [server] Change proxyprotocol to lazy mode [WIP] server: Change proxyprotocol to lazy mode Jul 19, 2022
@xhebox xhebox self-requested a review July 19, 2022 06:34
@hawkingrei hawkingrei self-requested a review July 19, 2022 09:25
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2022
xhebox
xhebox reviewed Jul 27, 2022
View reviewed changes
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

LGTM, is this still in WIP? Or are we waiting for verifications?

@blacktear23
Copy link
Contributor Author

just waiting for aws verification

@blacktear23 blacktear23 changed the title [WIP] server: Change proxyprotocol to lazy mode server: Change proxyprotocol to lazy mode Aug 2, 2022
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 2, 2022
@blacktear23
Copy link
Contributor Author

@xhebox AWS NLB test passed and one more thing, if we change proxy protocol to lazy mode, the header read timeout is useless. So shall we add some comments for related command line parameter?

@xhebox
Copy link
Contributor

xhebox commented Aug 2, 2022

@xhebox AWS NLB test passed and one more thing, if we change proxy protocol to lazy mode, the header read timeout is useless. So shall we add some comments for related command line parameter?

Sure!

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 2, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 2, 2022
@blacktear23 blacktear23 mentioned this pull request Aug 8, 2022
Merged
13 tasks
xhebox and others added 3 commits August 10, 2022 18:11
@xhebox
Merge branch 'master' into proxyprotocol-lazy-mode
f4f8582
@hawkingrei
upgrade dep
46025ee 
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@xhebox
update deps
603e6f0 
Signed-off-by: xhe <xw897002528@gmail.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 11, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 11, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/90a785877a669cdb458a8c84934e8996cceb00bc

@xhebox
*: fix CI
e1f88d1 
Signed-off-by: xhe <xw897002528@gmail.com>
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 11, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 11, 2022
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: e1f88d1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 11, 2022
@hawkingrei
Copy link
Member

/run-tidb_ghpr_integration_common_test

@hawkingrei
Copy link
Member

/run-integration-common-test

@ti-chi-bot
Copy link
Member

@blacktear23: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 5c00246 into pingcap:master Aug 11, 2022
morgo added a commit to morgo/tidb that referenced this pull request Aug 11, 2022
@morgo
Merge remote-tracking branch 'upstream/master' into improve-sysvar-co…
d71b97f 
…verage

* upstream/master: (98 commits)
  planner: provide a unified interface to set and get user variables and types (pingcap#37046)
  *: fix check-2 to bazel (pingcap#37055)
  distsql: revert 37019 (pingcap#37048)
  planner: introduce new functions for the general statement in session interface (pingcap#37024)
  session: make BenchmarkCompileExecutePreparedStmt update to date (pingcap#36960)
  server: Change proxyprotocol to lazy mode (pingcap#36301)
  test: fix `TestDDLSchedulingMultiTimes` and `TestConcurrentDDLSwitch` timeout (pingcap#37043)
  makefile: add bazel realtikvtest (pingcap#37042)
  distsql: make analyze request SI (pingcap#37019)
  *: gofmt code for adapting go 1.19 (pingcap#36832)
  planner: fix data race in the TestInlineProjection4HashJoinIssue15316 (pingcap#37014)
  planner: introduce Session.CacheGeneralStmt for general plan cache (pingcap#37028)
  server: revise scheme code (pingcap#37021)
  planner: fix unstable test TestPushDownSelectionForMPP (pingcap#37038)
  executor: more precise memory tracking (pingcap#35785)
  executor: add privilege check for prepare stmt (pingcap#36933)
  *: optimize temptable.SessionSnapshotInterceptor (pingcap#36999)
  statistics: batch insert topn and buckets to storage to speed up loading stats (pingcap#36948)
  planner: remove keyword `prepared` in plan cache backend (pingcap#37023)
  util: fix unstable test TestCheckCN (pingcap#37016)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@blacktear23 @ti-chi-bot @sre-bot @xhebox @hawkingrei