[release-24.0] etcd2topo: bound lock-acquisition cleanup RPCs (#20149)

[vitess-bot]

Description

This is a backport of #20149

[Copilot]

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

[vitess-bot]

Hello @arthurschreiber, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 20152
git reset --hard origin/release-24.0
git cherry-pick -m 1 fe26c0dc2168557278b914bcab2061005bf6a268

[arthurschreiber]

Resolved the conflict in go/vt/vtctl/workflow/utils_test.go.

The cherry-pick of #20149 hit a 3-way conflict on update() because release-24.0 uses context.Background() inside the function body, whereas main (parent of fe26c0d) had been updated to use t.Context() (which doesn't exist on release-24.0). The upstream PR replaces both with a caller-provided ctx.

Resolved by adopting the upstream signature exactly:

func update(t *testing.T, ctx context.Context, ts *topo.Server, id int) {

and dropping the inner context.WithCancel(...) block — the caller (testConcurrentKeyspaceRoutingRulesUpdates) was already updated by the cherry-pick to pass shortCtx.

Verified locally:

• go build ./go/vt/topo/etcd2topo/... ./go/vt/vtctl/workflow/... — clean
• go test ./go/vt/topo/etcd2topo/ — passes
• go test -run TestConcurrentKeyspaceRoutingRulesUpdates ./go/vt/vtctl/workflow/ — passes
• gofumpt / goimports — clean

[Copilot]

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.