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

kv: disable use of shared locks in conjunction with skip locked #116446

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

arulajmani
Copy link
Collaborator

We currently don't support the use of shared locks and the skip locked wait policy together. Until this limitation is lifted, we should return unimplemented errors instead of the wrong result.

Informs #110743

Release note: None

@arulajmani arulajmani requested a review from a team as a code owner December 14, 2023 14:58
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

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

:lgtm: after the test and lint failures are addressed.

Reviewed 7 of 7 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @michae2)

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @arulajmani and @michae2)


pkg/kv/kvserver/batcheval/cmd_scan.go line 152 at r1 (raw file):

		return MarkSkipLockedUnsupportedError(errors.UnimplementedError(
			errors.IssueLink{IssueURL: build.MakeIssueURL(110743)},
			"shared locks are incompatible with the skip locked wait policy",

Actually, is "incompatible" the right word? It sounds a final to me, as opposed to a temporary unsupported state.

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @arulajmani and @michae2)


pkg/kv/kvserver/batcheval/cmd_scan.go line 152 at r1 (raw file):

		return MarkSkipLockedUnsupportedError(errors.UnimplementedError(
			errors.IssueLink{IssueURL: build.MakeIssueURL(110743)},
			"shared locks are incompatible with the skip locked wait policy",

Actually, is "incompatible" the right word? It sounds a final to me, as opposed to a temporary unsupported state.

@arulajmani arulajmani force-pushed the sl-disable-skip-locked branch from 35a1189 to 73890e2 Compare December 15, 2023 14:50
Copy link
Collaborator Author

@arulajmani arulajmani left a comment

Choose a reason for hiding this comment

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

TFTR!

bors r=nvanbenschoten

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @michae2 and @nvanbenschoten)


pkg/kv/kvserver/batcheval/cmd_scan.go line 152 at r1 (raw file):

Previously, nvanbenschoten (Nathan VanBenschoten) wrote…

Actually, is "incompatible" the right word? It sounds a final to me, as opposed to a temporary unsupported state.

I clarified it to say "currently unsupported".

@craig
Copy link
Contributor

craig bot commented Dec 15, 2023

Build failed:

We currently don't support the use of shared locks and the skip locked
wait policy together. Until this limitation is lifted, we should return
unimplemented errors instead of the wrong result.

Informs cockroachdb#110743

Release note: None
@arulajmani arulajmani force-pushed the sl-disable-skip-locked branch from 73890e2 to 459fba0 Compare December 15, 2023 15:24
@arulajmani
Copy link
Collaborator Author

bors r=nvanbenschoten

@craig
Copy link
Contributor

craig bot commented Dec 15, 2023

Build succeeded:

@craig craig bot merged commit 9dd93d4 into cockroachdb:master Dec 15, 2023
7 of 9 checks passed
Copy link

blathers-crl bot commented Dec 15, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 459fba0 to blathers/backport-release-23.2-116446: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.x failed. See errors above.


error creating merge commit from 459fba0 to blathers/backport-release-23.2.0-rc-116446: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.0-rc failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.2.x Flags PRs that need to be backported to 23.2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants