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

*: update tikv/client-go to fix batch-client send loop panic issue #47716

Closed
wants to merge 7 commits into from

Conversation

crazycs520
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #47691

related PR: tikv/client-go#1021

Problem Summary: update tikv/client-go to fix batch-client send loop panic issue

What is changed and how it works?

Check List

Tests

  • Unit test

  • Integration test
    Side effects

  • Performance regression: Consumes more CPU

  • Performance regression: Consumes more Memory

  • Breaking backward compatibility

Documentation

  • N/A

Release note

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

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed 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. labels Oct 17, 2023
@tiprow
Copy link

tiprow bot commented Oct 17, 2023

Hi @crazycs520. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed do-not-merge/needs-triage-completed labels Oct 17, 2023
@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

Merging #47716 (b5b720e) into master (d0a5bc5) will increase coverage by 0.8979%.
Report is 71 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #47716        +/-   ##
================================================
+ Coverage   71.9075%   72.8055%   +0.8979%     
================================================
  Files          1398       1423        +25     
  Lines        405084     416081     +10997     
================================================
+ Hits         291286     302930     +11644     
- Misses        94200      94208         +8     
+ Partials      19598      18943       -655     
Flag Coverage Δ
integration 41.3909% <ø> (?)

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

Components Coverage Δ
dumpling 53.9913% <ø> (ø)
parser ∅ <ø> (∅)
br 48.6660% <ø> (-4.2891%) ⬇️

Signed-off-by: crazycs520 <[email protected]>
@crazycs520
Copy link
Contributor Author

/retest-required

@tiprow
Copy link

tiprow bot commented Oct 17, 2023

@crazycs520: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest-required

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.

@crazycs520
Copy link
Contributor Author

/ok-to-test

@ti-chi-bot ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Oct 17, 2023
session.ResultSetToStringSlice(ctx, tk.Session(), rs)
}
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove this useless line.
Besides, I ran this test(with --with-real-tikv and -race) locally with the master version 2 twice and passed both times. Is this test unreliable or does it need to work well on CI?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice catch. I wrote this test in the release-6.5 branch first time, and the test will fail in release-6.5 branch.

Master branch can pass the test even without tikv/client-go#1021 , I still keep the test to detect data race in future.

Copy link
Contributor Author

@crazycs520 crazycs520 Oct 18, 2023

Choose a reason for hiding this comment

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

In release-6.5 run this test will fail.

github.com/pingcap/tidb  release-6.5 ✗                                                                                                                                          
▶ cd tests/realtikvtest/sessiontest/

tests/realtikvtest/sessiontest  release-6.5 ✗                                                                                                                                   
▶ go test -race --tags=intest -run=TestBatchClientDataRace --with-real-tikv=true
...
...
...
[2023/10/18 14:56:15.607 +08:00] [INFO] [pd.go:209] ["closed pd http client"]
--- FAIL: TestBatchClientDataRace (31.54s)
    testing.go:1465: race detected during execution of test
FAIL
exit status 1
FAIL    github.com/pingcap/tidb/tests/realtikvtest/sessiontest  32.724s

Signed-off-by: crazycs520 <[email protected]>
Copy link
Contributor

@zimulala zimulala 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 bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 18, 2023
Signed-off-by: crazycs520 <[email protected]>
Signed-off-by: crazycs520 <[email protected]>
Signed-off-by: crazycs520 <[email protected]>
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 18, 2023

@crazycs520: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/unit-test b5b720e link true /test unit-test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@tiprow
Copy link

tiprow bot commented Oct 18, 2023

@crazycs520: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
tiprow_fast_test b5b720e link true /test tiprow_fast_test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nolouch, zimulala

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 18, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 18, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-18 06:54:07.884661804 +0000 UTC m=+1812845.471771949: ☑️ agreed by zimulala.
  • 2023-10-18 09:50:21.8702728 +0000 UTC m=+1823419.457382930: ☑️ agreed by nolouch.

@cfzjywxk
Copy link
Contributor

@crazycs520
Is it already picked to the release-7.5 branch? If not we need to pick the fix to release-7.5 it's a blocking issue.

@crazycs520
Copy link
Contributor Author

#48109 already updated the go.mod.

@crazycs520 crazycs520 closed this Oct 31, 2023
@seiya-annie
Copy link

/found community

@ti-chi-bot ti-chi-bot bot added the report/community The community has encountered this bug. label Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. report/community The community has encountered this bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

client-go batch client batchSendLoop panic
5 participants