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

Revert "server: Set default drainClientWait as 15s (#42134) (#48944)" #49101

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

djshow832
Copy link
Contributor

@djshow832 djshow832 commented Dec 1, 2023

This reverts commit 877198d.

What problem does this PR solve?

Issue Number: ref #49098

Problem Summary:
#32111 causes too many problems, so we decided to revert it in v6.5.6 and merge #49073 to v6.5.6.

What changed and how does it work?

Revert PR.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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.

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 1, 2023
Copy link

tiprow bot commented Dec 1, 2023

Hi @djshow832. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 1, 2023
Copy link

codecov bot commented Dec 1, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@e5ee37e). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #49101   +/-   ##
================================================
  Coverage               ?   73.6315%           
================================================
  Files                  ?       1087           
  Lines                  ?     349436           
  Branches               ?          0           
================================================
  Hits                   ?     257295           
  Misses                 ?      75621           
  Partials               ?      16520           

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 1, 2023
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 4, 2023
Copy link

ti-chi-bot bot commented Dec 4, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bb7133, tiancaiamao

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 4, 2023
Copy link

ti-chi-bot bot commented Dec 4, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-01 10:51:49.207604085 +0000 UTC m=+1179137.872830279: ☑️ agreed by tiancaiamao.
  • 2023-12-04 04:05:22.116104399 +0000 UTC m=+1413950.781330594: ☑️ agreed by bb7133.

@ti-chi-bot ti-chi-bot bot merged commit 9d6b66a into pingcap:release-6.5 Dec 4, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants