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: propagate the settings properly into the stmt bundle builder #94949

Merged
merged 1 commit into from
Jan 11, 2023

Conversation

yuzefovich
Copy link
Member

A few months ago we extended the collection of the cluster settings into the stmt bundle to also get the global default value. That getter method takes in a pointer to the current cluster settings' values, and we passed nil. This can cause nil pointer errors and is now fixed.

Found when working on #94936.

Epic: None

Release note: None

A few months ago we extended the collection of the cluster settings into
the stmt bundle to also get the global default value. That getter method
takes in a pointer to the current cluster settings' values, and we
passed nil. This can cause nil pointer errors and is now fixed.

Release note: None
@yuzefovich yuzefovich requested review from michae2 and a team January 9, 2023 19:42
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm: Nice catch! Thank you!

I vote we backport this to release-22.2, WDYT?

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

@yuzefovich
Copy link
Member Author

Sounds good, added the label.

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 9, 2023

Build failed (retrying...):

@michae2
Copy link
Collaborator

michae2 commented Jan 9, 2023

I just noticed the PR number, nice.

@craig
Copy link
Contributor

craig bot commented Jan 9, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jan 9, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jan 10, 2023

Canceled.

@yuzefovich
Copy link
Member Author

Oops, pushed into the wrong branch :D

@yuzefovich yuzefovich force-pushed the stmt-bundle-settings branch from 5af0b14 to 264f8d8 Compare January 10, 2023 00:30
@yuzefovich
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 10, 2023

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

@yuzefovich
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 10, 2023

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

@yuzefovich
Copy link
Member Author

bors r+
bors single on

@craig
Copy link
Contributor

craig bot commented Jan 10, 2023

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

@yuzefovich
Copy link
Member Author

bors r+ single=on

@yuzefovich
Copy link
Member Author

bors r+ single on

@craig
Copy link
Contributor

craig bot commented Jan 11, 2023

Build succeeded:

@craig craig bot merged commit c53c3c7 into cockroachdb:master Jan 11, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jan 11, 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 264f8d8 to blathers/backport-release-22.2-94949: 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.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants