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

sql: use txn.NewBatch instead of &kv.Batch{} #107236

Merged
merged 1 commit into from
Jul 24, 2023

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Jul 20, 2023

This will make these requests properly passes along the admission control headers.

informs #79212
Epic: None
Release note: None

@rafiss rafiss requested a review from irfansharif July 20, 2023 05:10
@rafiss rafiss requested review from a team as code owners July 20, 2023 05:10
@rafiss rafiss requested a review from yuzefovich July 20, 2023 05:10
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss rafiss added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Jul 20, 2023
@yuzefovich
Copy link
Member

Maybe add a linter for this too (like simple text based, over pkg/sql* ignoring tests)?

@rafiss
Copy link
Collaborator Author

rafiss commented Jul 20, 2023

Maybe add a linter for this too

There is a usage in pkg/sql/tenant_gc.go that I don't know how to address. I was planning to reach out to the multi-tenant team to see if that can be addressed separately.

There are also some in pkg/server that I don't know what to do about.

@rafiss
Copy link
Collaborator Author

rafiss commented Jul 20, 2023

I also found usages like this one:

var b kv.Batch
b.AdmissionHeader = kvpb.AdmissionHeader{
Priority: int32(admissionpb.BulkNormalPri),
CreateTime: timeutil.Now().UnixNano(),
Source: kvpb.AdmissionHeader_FROM_SQL,
NoMemoryReservedAtSource: true,
}

It seems like it would be better to have a linter or runtime assertion to check that AdmissionHeader is always set, one way or another.

This will make these requests properly passes along the admission
control headers.

There are more usages in addition to these ones that are not trivial to
address.

Release note: None
Copy link
Collaborator

@fqazi fqazi left a comment

Choose a reason for hiding this comment

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

Reviewed 11 of 11 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @irfansharif and @yuzefovich)

@rafiss
Copy link
Collaborator Author

rafiss commented Jul 24, 2023

tftr!

bors r=fqazi

@craig
Copy link
Contributor

craig bot commented Jul 24, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented Jul 24, 2023

Build succeeded:

@craig craig bot merged commit 4618dbf into cockroachdb:master Jul 24, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jul 24, 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 3bd2698 to blathers/backport-release-22.2-107236: 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 22.2.x failed. See errors above.


error setting reviewers, but backport branch blathers/backport-release-23.1-107236 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/107472/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. []

Backport to branch 23.1.x 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.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants