Skip to content

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

Merged
ti-chi-bot[bot] merged 4 commits intotikv:release-6.5from
ti-chi-bot:cherry-pick-6452-to-release-6.5
May 24, 2023
Merged

replication_mode: fix the state cannot switch to async while existing learner node (#6452)#6483
ti-chi-bot[bot] merged 4 commits intotikv:release-6.5from
ti-chi-bot:cherry-pick-6452-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
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.

ref tikv#4399, close tikv/tikv#14704

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented May 18, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • 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.

Details

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

@lhy1024 lhy1024 left a comment

Choose a reason for hiding this comment

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

need fix conflict

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 18, 2023
@Yisaer Yisaer removed their request for review May 19, 2023 06:30
Signed-off-by: nolouch <nolouch@gmail.com>
@codecov
Copy link
Copy Markdown

codecov bot commented May 24, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.13 🎉

Comparison is base (d086bd5) 75.56% compared to head (27e5ff8) 75.69%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-6.5    #6483      +/-   ##
===============================================
+ Coverage        75.56%   75.69%   +0.13%     
===============================================
  Files              330      330              
  Lines            33052    33065      +13     
===============================================
+ Hits             24975    25030      +55     
+ Misses            5910     5885      -25     
+ Partials          2167     2150      -17     
Flag Coverage Δ
unittests 75.69% <100.00%> (+0.13%) ⬆️

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

Impacted Files Coverage Δ
pkg/mock/mockcluster/mockcluster.go 93.99% <100.00%> (+0.04%) ⬆️
server/api/store.go 66.48% <100.00%> (+0.08%) ⬆️
server/core/basic_cluster.go 90.81% <100.00%> (ø)
server/core/region.go 90.19% <100.00%> (ø)
server/core/store.go 80.55% <100.00%> (+0.15%) ⬆️
server/core/store_option.go 100.00% <100.00%> (ø)
server/replication/replication_mode.go 78.94% <100.00%> (+0.13%) ⬆️
server/statistics/store_collection.go 93.86% <100.00%> (+0.11%) ⬆️

... and 26 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.

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 24, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 24, 2023
@nolouch
Copy link
Copy Markdown
Contributor

nolouch commented May 24, 2023

/merge

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented May 24, 2023

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

/run-all-tests

Details

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

ti-chi-bot bot commented May 24, 2023

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

DetailsCommit hash: bbb3313

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2023
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented May 24, 2023

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

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.

Details

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 bot merged commit cb52d28 into tikv:release-6.5 May 24, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Jun 14, 2023

This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Details

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.

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

Labels

do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants