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

raftstore: use force_send to send ApplyRes #13168

Merged

ti-chi-bot merged 3 commits into tikv:master from 5kbpers:apply-res-send

Jul 29, 2022

Member

5kbpers commented Jul 29, 2022

Signed-off-by: 5kbpers hustmh@gmail.com

What is changed and how it works?

Issue Number: Close #13160

What's Changed:

Use force_send to send ApplyRes

Related changes

Need to cherry-pick to the release branch

Check List

Tests

Unit test
Integration test

Side effects

Performance regression
- Consumes more MEM

Release note

Fix a bug that regions may be overlapped if raftstore is too busy


          raftstore: use force_send to send ApplyRes

a0b536c

Signed-off-by: 5kbpers <hustmh@gmail.com>

Member

ti-chi-bot commented Jul 29, 2022 •

edited

Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

Connor1996
gengliqi

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 added release-note do-not-merge/needs-triage-completed size/M labels


          Merge branch 'master' into apply-res-send

a04ebcb

ti-chi-bot added needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 needs-cherry-pick-release-5.4 needs-cherry-pick-release-6.0 needs-cherry-pick-release-6.1 needs-cherry-pick-release-6.2 and removed do-not-merge/needs-triage-completed labels

Connor1996 approved these changes

View reviewed changes

Member

Connor1996 left a comment

LGTM

ti-chi-bot added the status/LGT1 label

BusyJay reviewed

View reviewed changes

components/raftstore/src/store/fsm/store.rs

                               PeerMsg::ApplyRes {
                                   res: ApplyTaskRes::Apply(r),
                               },
-                          );
+                          ) {
+                              error!("failed to send apply result"; "region_id" => region_id, "err" => ?e);

Member

BusyJay Jul 29, 2022

What if it's shutting down?

Member Author

5kbpers Jul 29, 2022

Already checked here

tikv/components/batch-system/src/router.rs

Line 263 in 1e13ddf

if self.is_shutdown() {

gengliqi reviewed

View reviewed changes

components/raftstore/src/store/fsm/store.rs Show resolved Hide resolved

gengliqi approved these changes

View reviewed changes

Member

gengliqi left a comment

LGTM

ti-chi-bot added status/LGT2 and removed status/LGT1 labels

Member Author

5kbpers commented Jul 29, 2022

/merge

Member

ti-chi-bot commented Jul 29, 2022

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

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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.

Member

ti-chi-bot commented Jul 29, 2022

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

Commit hash: a04ebcb

ti-chi-bot added the status/can-merge label


          Merge branch 'master' into apply-res-send

00f62e7

ti-chi-bot merged commit 940e139 into tikv:master

ti-chi-bot added this to the Pool milestone

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13172

Closed

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-5.2 in PR #13172

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#13168 to release-5.3

293c16a

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13173

Closed

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-5.3 in PR #13173

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#13168 to release-5.4

418af7b

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13174

Merged

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-5.4 in PR #13174

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#13168 to release-6.0

235471c

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13175

Closed

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-6.0 in PR #13175

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#13168 to release-6.1

17b56c7

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13176

Merged

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-6.1 in PR #13176

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#13168 to release-6.2

f97212a

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

raftstore: use force_send to send ApplyRes (#13168) #13177

Merged

Contributor

ti-srebot commented Jul 29, 2022

cherry pick to release-6.2 in PR #13177

ti-chi-bot pushed a commit that referenced this pull request


          raftstore: use force_send to send ApplyRes (#13168) (#13177)

c7234fd

close #13160, ref #13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

5kbpers added a commit to 5kbpers/tikv that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168)

dccb83d

close tikv#13160

Use force_send to send ApplyRes

Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Signed-off-by: 5kbpers <hustmh@gmail.com>

ti-chi-bot pushed a commit that referenced this pull request


          raftstore: use force_send to send ApplyRes (#13168) (#13171)

3b872cf

close #13160, ref #13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

CalvinNeo pushed a commit to pingcap/tidb-engine-ext that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168) (tikv#13171)

7e95b03

close tikv#13160, ref tikv#13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

CalvinNeo pushed a commit to pingcap/tidb-engine-ext that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168) (tikv#13171)

9c7e7ae

close tikv#13160, ref tikv#13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

CalvinNeo pushed a commit to pingcap/tidb-engine-ext that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168) (tikv#13171)

2f42417

close tikv#13160, ref tikv#13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

ti-chi-bot added a commit that referenced this pull request


          Cherry pick #13168 and #13193 to release-5.4 hotfix (#13205)

0b7b8b8

ref #13168, ref #13193

Cherry pick #13168 and #13193 to release-5.4 hotfix

Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

CalvinNeo pushed a commit to CalvinNeo/tidb-engine-ext that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168) (tikv#13171)

60b3622

close tikv#13160, ref tikv#13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

CalvinNeo pushed a commit to CalvinNeo/tidb-engine-ext that referenced this pull request


          raftstore: use force_send to send ApplyRes (tikv#13168)

35834e8

close tikv#13160

Use force_send to send ApplyRes

Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

CalvinNeo added a commit to pingcap/tidb-engine-ext that referenced this pull request


          updating proxy 6.1 for 2 bugfixs (#135)

0d0ae48

* raftstore: make `UNREACHABLE_BACKOFF` configurable (tikv#13193)

close tikv#13054

make `UNREACHABLE_BACKOFF` configurable.

Signed-off-by: 5kbpers <hustmh@gmail.com>

* raftstore: use force_send to send ApplyRes (tikv#13168) (tikv#13171)

close tikv#13160, ref tikv#13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>

* f

Signed-off-by: CalvinNeo <calvinneo1995@gmail.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>
Co-authored-by: ti-srebot <66930949+ti-srebot@users.noreply.github.com>

CalvinNeo added a commit to pingcap/tidb-engine-ext that referenced this pull request


          updating proxy 6.2 for 2 bugfixs (#137)

2685d85

and unsafe backoff

* raftstore: use force_send to send ApplyRes (tikv#13168)

close tikv#13160

Use force_send to send ApplyRes

Signed-off-by: 5kbpers <hustmh@gmail.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

Co-authored-by: 5kbpers <hustmh@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

ti-chi-bot added a commit that referenced this pull request


          raftstore: use force_send to send ApplyRes (#13168) (#13176)

b187ad5

close #13160, ref #13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

ti-chi-bot pushed a commit that referenced this pull request


          raftstore: use force_send to send ApplyRes (#13168) (#13174)

b458ccd

close #13160, ref #13168

Use force_send to send ApplyRes

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: Xinye Tao <xy.tao@outlook.com>

Co-authored-by: 5kbpers <hustmh@gmail.com>
Co-authored-by: Xinye Tao <xy.tao@outlook.com>

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

Labels

needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 needs-cherry-pick-release-5.4 needs-cherry-pick-release-6.0 needs-cherry-pick-release-6.1 needs-cherry-pick-release-6.2 release-note size/M status/can-merge status/LGT2