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

replication_mode: fix the state cannot switch to async while existing learner node (#6452) #6484

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6452

What problem does this PR solve?

Issue Number: ref #4399 Close tikv/tikv#14704

What is changed and how does it work?

replication_mode: fix the state cannot switch to async while existing learner node
 - skip the learner node when check the stores state

Check List

Tests

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

Release note

None.

…arner node

Signed-off-by: nolouch <nolouch@gmail.com>
Signed-off-by: nolouch <nolouch@gmail.com>
Signed-off-by: nolouch <nolouch@gmail.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 18, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch

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 bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels May 18, 2023
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. label May 18, 2023
@ti-chi-bot ti-chi-bot bot requested review from nolouch and rleungx May 18, 2023 08:07
@codecov
Copy link

codecov bot commented May 18, 2023

Codecov Report

Patch coverage: 94.73% and project coverage change: -0.01 ⚠️

Comparison is base (3a957d0) 74.95% compared to head (56d6dd5) 74.95%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.1    #6484      +/-   ##
===============================================
- Coverage        74.95%   74.95%   -0.01%     
===============================================
  Files              408      408              
  Lines            40683    40697      +14     
===============================================
+ Hits             30494    30504      +10     
+ Misses            7528     7523       -5     
- Partials          2661     2670       +9     
Flag Coverage Δ
unittests 74.95% <94.73%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/api/store.go 66.40% <66.66%> (+0.08%) ⬆️
pkg/core/basic_cluster.go 93.75% <100.00%> (ø)
pkg/core/region.go 88.97% <100.00%> (ø)
pkg/core/store.go 77.77% <100.00%> (+0.15%) ⬆️
pkg/core/store_option.go 100.00% <100.00%> (ø)
pkg/mock/mockcluster/mockcluster.go 94.74% <100.00%> (+0.03%) ⬆️
pkg/statistics/store_collection.go 89.20% <100.00%> (+0.25%) ⬆️
server/replication/replication_mode.go 78.94% <100.00%> (+0.13%) ⬆️

... and 31 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 18, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 18, 2023
@nolouch nolouch added the require-LGT1 Indicates that the PR requires an LGTM. label May 18, 2023
@nolouch
Copy link
Contributor

nolouch commented May 18, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 18, 2023

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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
Copy link
Contributor

ti-chi-bot bot commented May 18, 2023

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

Commit hash: 56d6dd5

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 18, 2023
@ti-chi-bot ti-chi-bot bot merged commit a8857e9 into tikv:release-7.1 May 18, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels May 31, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants