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

br/streamhelper: fix subscribe error #39689

Merged
merged 12 commits into from
Dec 7, 2022

Conversation

YuJuncen
Copy link
Contributor

@YuJuncen YuJuncen commented Dec 7, 2022

Signed-off-by: hillium [email protected]

What problem does this PR solve?

Issue Number: close #39688

Problem Summary:
We clear the subscription error before canceling the subscription, once there are some errors emitted during canceling, there would be a error-retry loop.

What is changed and how it works?

This PR:

  • Make subscriptions don't emit error when meeting Status(codes.Canceled, _).
  • Clear the error after canceling current subscription.

Check List

Tests

  • Unit test

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fixed a bug that may cause TiDB send unexpected unnecessary requests to TiKV.

Signed-off-by: hillium <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 7, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • joccau

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/invalid-title release-note Denotes a PR that will be considered when it comes time to generate release notes. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 7, 2022
@YuJuncen YuJuncen changed the title fix subscribe error br/streamhelper: fix subscribe error Dec 7, 2022
Signed-off-by: hillium <[email protected]>
Copy link
Member

@joccau joccau 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 the status/LGT1 Indicates that a PR has LGTM 1. label Dec 7, 2022
@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 Dec 7, 2022
@YuJuncen
Copy link
Contributor Author

YuJuncen commented Dec 7, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 53af820

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 7, 2022
@ti-chi-bot ti-chi-bot merged commit 98d84ab into pingcap:master Dec 7, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #39745.

@sre-bot
Copy link
Contributor

sre-bot commented Dec 7, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🟥 failed 1, success 5, total 6 5 min 10 sec New failing
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 4 min 16 sec Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 40 tests passed 19 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 29 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 9 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 32 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 27 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot added a commit that referenced this pull request Dec 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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
Development

Successfully merging this pull request may close these issues.

log-backup: the subscription conntion may be create too many times when TiKV node restarts too fast
6 participants