Skip to content

*: bump client-go to master (#70301) - #70312

Closed
ti-chi-bot wants to merge 1 commit into
pingcap:release-8.5from
ti-chi-bot:cherry-pick-70301-to-release-8.5
Closed

ti-chi-bot wants to merge 1 commit into
pingcap:release-8.5from
ti-chi-bot:cherry-pick-70301-to-release-8.5

Conversation

@ti-chi-bot

@ti-chi-bot ti-chi-bot commented Aug 3, 2026 •

Copy link
Copy Markdown
Member

This is an automated cherry-pick of #70301

What problem does this PR solve?

Issue Number: ref #69335

Problem Summary:

TiDB was pinned to an older client-go master commit. The latest client-go master commit updates its Go toolchain requirement to Go 1.25.12, matching TiDB's current Go version.

What changed and how does it work?

  • Bump github.com/tikv/client-go/v2 from 61ecd7c11416 to 341d4692ec57 (v2.0.8-0.20260803074519-341d4692ec57).
  • Regenerate the Go module checksums and Bazel dependency metadata.
  • The upstream delta is *: upgrade Go to 1.25.12 tikv/client-go#2036 and contains no client-go source or API changes.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Commands:

go mod verify
make tidy
make check-bazel-prepare
./tools/check/failpoint-go-test.sh pkg/store/driver -run '^TestSetDefaultAndOptions$' -count=1
make lint

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

None

Summary by CodeRabbit

  • Chores
    • Updated underlying service components to newer revisions.
    • Resolved conflicting configuration entries to ensure consistent builds and dependency resolution.
  • Bug Fixes
    • Prevented version mismatches that could cause build or release failures.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Aug 3, 2026
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 3, 2026
2 of 13 tasks
@ti-chi-bot

Copy link
Copy Markdown
Member Author

@wfxr This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot

ti-chi-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

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 added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 3, 2026
@ti-chi-bot

ti-chi-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jiyfhust for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

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

Details 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

@coderabbitai

coderabbitai Bot commented Aug 3, 2026 •

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

The change adds unresolved merge-conflict markers to DEPS.bzl and go.mod. The conflicts contain competing TiKV client, PD client, bodyclose, version, and checksum entries.

Changes

Dependency conflict markers

Layer / File(s) Summary
Resolve dependency declarations
DEPS.bzl, go.mod
Dependency declarations contain competing versions and checksums for TiKV-related dependencies, with unresolved merge markers retained.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

Suggested reviewers: ekexium, bb7133, winoros

Poem

A rabbit found conflicts in the dependency burrow,
Two versions argued over checksum sorrow.
“Choose one branch,” the rabbit said,
“Then clear the markers overhead!”
Clean builds hop tomorrow.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the client-go dependency update and follows the repository's accepted wildcard format.
Description check ✅ Passed The description includes the issue reference, problem, changes, tests, side effects, documentation, and release note sections.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions


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.

@coderabbitai coderabbitai 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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@go.mod`:
- Around line 121-129: Resolve the dependency merge conflict in go.mod at lines
121-129 by removing all conflict markers and retaining the client-go update set,
including client-go/v2 v2.0.8-0.20260803074519-341d4692ec57 with its matching
pd/client and bodyclose versions; regenerate go.sum. In DEPS.bzl lines
3908-3914, update the client-go/v2 declaration to the matching
v2.0.8-0.20260803074519-341d4692ec57 version and checksum pair.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: d6063bb1-230a-45a1-a47a-149e6e315190

📥 Commits

Reviewing files that changed from the base of the PR and between 4b91629 and f447204.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (2)
  • DEPS.bzl
  • go.mod

Comment thread go.mod
Comment on lines +121 to +129
<<<<<<< HEAD
github.com/tikv/client-go/v2 v2.0.8-0.20260615130046-a2b634d170d9
github.com/tikv/pd/client v0.0.0-20260609141937-b01426f6b08b
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
=======
github.com/tikv/client-go/v2 v2.0.8-0.20260803074519-341d4692ec57
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
>>>>>>> efe6e6957cc (*: bump client-go to master (#70301))

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🔴 Critical | ⚡ Quick win

Resolve the merge conflict in both dependency manifests.

The unresolved markers make the dependency declarations invalid. Remove the markers and retain one coherent dependency set for the intended client-go update.

  • go.mod#L121-L129: select one version set for client-go/v2, pd/client, and bodyclose, then regenerate go.sum.
  • DEPS.bzl#L3908-L3914: select the matching client-go/v2 version/checksum pair.
  • Confirm that both manifests use v2.0.8-0.20260803074519-341d4692ec57 for client-go/v2.
📍 Affects 2 files
  • go.mod#L121-L129 (this comment)
  • DEPS.bzl#L3908-L3914
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@go.mod` around lines 121 - 129, Resolve the dependency merge conflict in
go.mod at lines 121-129 by removing all conflict markers and retaining the
client-go update set, including client-go/v2
v2.0.8-0.20260803074519-341d4692ec57 with its matching pd/client and bodyclose
versions; regenerate go.sum. In DEPS.bzl lines 3908-3914, update the
client-go/v2 declaration to the matching v2.0.8-0.20260803074519-341d4692ec57
version and checksum pair.

@ti-chi-bot

ti-chi-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

@ti-chi-bot: The following tests 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/check_dev_2 f447204 link true /test check-dev2
idc-jenkins-ci-tidb/check_dev f447204 link true /test check-dev
idc-jenkins-ci-tidb/unit-test f447204 link true /test unit-test
idc-jenkins-ci-tidb/mysql-test f447204 link true /test mysql-test
idc-jenkins-ci-tidb/build f447204 link true /test build

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.

@ti-chi-bot ti-chi-bot Bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 3, 2026
@YangKeao

YangKeao commented Aug 4, 2026

Copy link
Copy Markdown
Member

Already fixed in #70303

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

Labels

cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants