Repository navigation
*: bump client-go to master (#70301) - #70312
ti-chi-bot wants to merge 1 commit into
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
@wfxr This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. DetailsInstructions 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
📝 WalkthroughWalkthroughThe change adds unresolved merge-conflict markers to ChangesDependency conflict markers
Estimated code review effort: 1 (Trivial) | ~5 minutes Possibly related PRs
Suggested reviewers: Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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 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. Comment |
There was a problem hiding this comment.
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
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (2)
DEPS.bzlgo.mod
| <<<<<<< 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)) |
There was a problem hiding this comment.
🗄️ 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 forclient-go/v2,pd/client, andbodyclose, then regeneratego.sum.DEPS.bzl#L3908-L3914: select the matchingclient-go/v2version/checksum pair.- Confirm that both manifests use
v2.0.8-0.20260803074519-341d4692ec57forclient-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: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
Already fixed in #70303 |
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?
github.com/tikv/client-go/v2from61ecd7c11416to341d4692ec57(v2.0.8-0.20260803074519-341d4692ec57).Check List
Tests
Commands:
go mod verify make tidy make check-bazel-prepare ./tools/check/failpoint-go-test.sh pkg/store/driver -run '^TestSetDefaultAndOptions$' -count=1 make lintSide effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.
Summary by CodeRabbit