Skip to content

deps: Bump tikv client 6125c3b (#5439)#5507

Merged
wk989898 merged 1 commit into
pingcap:release-nextgen-202603from
ti-chi-bot:cherry-pick-5439-to-release-nextgen-202603
Jun 26, 2026
Merged

deps: Bump tikv client 6125c3b (#5439)#5507
wk989898 merged 1 commit into
pingcap:release-nextgen-202603from
ti-chi-bot:cherry-pick-5439-to-release-nextgen-202603

Conversation

@ti-chi-bot

Copy link
Copy Markdown
Member

This is an automated cherry-pick of #5439

What problem does this PR solve?

Issue Number: close #5440

What is changed and how it works?

Bump tikv/client-go to 6125c3b to support resolving txn file locks.

Ref: tikv/client-go#2003

Check List

Tests

  • Integration tests with nextgen cluster

TiCDC logs:

[2026/06/18 05:01:27.112 +00:00] [INFO] [lock_resolver.go:1530] ["txn lock cleanup resolve-region rpc finished"] [action=commit] [txnStartTS=467077400967512072] [commitTS=467077401675301177] [regionID=9265] [keyCount=8]
[2026/06/18 05:01:27.114 +00:00] [DEBUG] [lock_resolver.go:95] ["resolve lock finishes"] [regionID=9265] [lockCount=8] [sampleLocks="[{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAgOAAAAAAAAADQOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADQ==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAwOAAAAAAAAABwOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABw==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABAOAAAAAAAAABAOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABA==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABQOAAAAAAAAAGgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAGg==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true}]"] [maxVersion=467077401124798464] [duration=7.47611ms] []

Questions

Will it cause performance regression or break compatibility?

No.

Do you need to update user documentation, design documentation or monitoring documentation?

No.

Release note

Bump tikv/client-go to 6125c3b to support resolving txn file locks.

Summary by CodeRabbit

  • Chores
    • Updated dependency version for improved stability and compatibility.

Signed-off-by: Ping Yu <yuping@pingcap.com>
@ti-chi-bot ti-chi-bot added lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-nextgen-202603 labels Jun 26, 2026
@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 47c2f78d-a2d7-4655-a0a9-d7765533ba96

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Code Review

This pull request updates the github.com/tikv/client-go/v2 dependency to a newer commit version in go.mod and go.sum. I have no feedback to provide.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@pingyu

pingyu commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

/test all

@ti-chi-bot

ti-chi-bot Bot commented Jun 26, 2026

Copy link
Copy Markdown

@pingyu: No jobs can be run with /test all.
The following commands are available to trigger optional jobs:

/test pull-build-next-gen
/test pull-cdc-kafka-integration-heavy-next-gen
/test pull-cdc-kafka-integration-heavy-next-gen-legacy-safepoint
/test pull-cdc-kafka-integration-light-next-gen
/test pull-cdc-kafka-integration-light-next-gen-legacy-safepoint
/test pull-cdc-mysql-integration-heavy-next-gen
/test pull-cdc-mysql-integration-heavy-next-gen-legacy-safepoint
/test pull-cdc-mysql-integration-light-next-gen
/test pull-cdc-mysql-integration-light-next-gen-legacy-safepoint
/test pull-cdc-pulsar-integration-heavy-next-gen
/test pull-cdc-pulsar-integration-heavy-next-gen-legacy-safepoint
/test pull-cdc-pulsar-integration-light-next-gen
/test pull-cdc-pulsar-integration-light-next-gen-legacy-safepoint
/test pull-cdc-storage-integration-heavy-next-gen
/test pull-cdc-storage-integration-heavy-next-gen-legacy-safepoint
/test pull-cdc-storage-integration-light-next-gen
/test pull-cdc-storage-integration-light-next-gen-legacy-safepoint
/test pull-unit-test-next-gen
Details

In response to this:

/test all

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-sigs/prow repository.

@pingyu

pingyu commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

/test next-gen

@pingyu

pingyu commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

/retest

@ti-chi-bot ti-chi-bot Bot added the approved label Jun 26, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jun 26, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tenfyzhong, wk989898

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [tenfyzhong,wk989898]

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

@wk989898
wk989898 merged commit 01f5bbe into pingcap:release-nextgen-202603 Jun 26, 2026
10 of 11 checks passed
@ti-chi-bot

ti-chi-bot Bot commented Jun 26, 2026

Copy link
Copy Markdown

@ti-chi-bot: 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
pull-unit-test-next-gen 5318cd0 link unknown /test pull-unit-test-next-gen

Full PR test history. Your PR dashboard.

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

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

Labels

approved lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-nextgen-202603

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants