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

domain: adjust the order of acquireServerID and GlobalInfoSyncerInit to fix global kill test #33536

Merged
merged 2 commits into from
Mar 29, 2022
Merged

domain: adjust the order of acquireServerID and GlobalInfoSyncerInit to fix global kill test #33536

merged 2 commits into from
Mar 29, 2022

Conversation

xuyifangreeneyes
Copy link
Contributor

@xuyifangreeneyes xuyifangreeneyes commented Mar 29, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #33538

Problem Summary:
globalkilltest TestMultipleTiDB failed.

What is changed and how it works?

When #17649 introduces global kill, in (*Domain).Init, we first call do.acquireServerID to get server ID and then call infosync.GlobalInfoSyncerInit to store server ID to etcd. #28945 switches the order between do.acquireServerID and infosync.GlobalInfoSyncerInit and thus we store server ID zero to etcd, which causes the failure of TestMultipleTiDB. The pr switches the order back to fix the test case.

Check List

Tests

  • Unit test
  • Integration test (though globalkilltest seems not to be executed in CI)
  • 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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 29, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • pingyu

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/needs-triage-completed and removed do-not-merge/needs-linked-issue labels Mar 29, 2022
@xuyifangreeneyes
Copy link
Contributor Author

/cc @pingyu @AilinKid

@xuyifangreeneyes
Copy link
Contributor Author

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Mar 29, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/50bc442b6e3e4ea852d434516e73f041e4e00693

pingyu
pingyu approved these changes Mar 29, 2022
View reviewed changes
Copy link
Contributor

@pingyu pingyu left a comment

Choose a reason for hiding this comment

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

Great ! LGTM~

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 2022
@pingyu
Copy link
Contributor

pingyu commented Mar 29, 2022

P.S. It would be better to add "tests/globalkilltest" to CI later, to avoid similar issue again. But it seems to be not stable now and need some improvement.

AilinKid
AilinKid approved these changes Mar 29, 2022
View reviewed changes
Copy link
Contributor

@AilinKid AilinKid 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 added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 29, 2022
@Reminiscent
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1c7a4bf

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2022
@ti-chi-bot ti-chi-bot merged commit 4e708d1 into pingcap:master Mar 29, 2022
@xuyifangreeneyes xuyifangreeneyes deleted the fix-global-kill branch March 31, 2022 05:04
@xuyifangreeneyes
Copy link
Contributor Author

/help

@xuyifangreeneyes
Copy link
Contributor Author

/need-cherry-pick

@tiancaiamao tiancaiamao added the needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. label Apr 26, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Apr 26, 2022
@xuyifangreeneyes @ti-srebot
cherry pick pingcap#33536 to release-5.4
7883dcf 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Apr 26, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #34255

ti-chi-bot pushed a commit that referenced this pull request Apr 27, 2022
@ti-srebot
domain: adjust the order of acquireServerID and GlobalInfoSyncerInit …
74cc44b 
…to fix global kill test (#33536) (#34255)

close #33538
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid approved these changes

@pingyu pingyu pingyu approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. 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.

globalkilltest TestMultipleTiDB failed
8 participants
@xuyifangreeneyes @ti-chi-bot @sre-bot @pingyu @Reminiscent @ti-srebot @AilinKid @tiancaiamao