server: Resolve default engine type in testserver #49372
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
This change is |
Previously we weren't resolving the engine type if it was set to EngineTypeDefault in the testserver. This would silently resolve to Pebble (and in 20.1, rocksdb) anyway, so it was only a concern in sentry reports where it would show up as `default`. Since `cockroach demo` uses the test server and has sentry reports enabled, that was an oversight. Fixes cockroachdb#49368. Release note (bug fix): Report engine type correctly in bug reports when using `cockroach demo`.
itsbilal
force-pushed
the
testserver-default-engtype-fix
branch
from
309bc93 to
74881ea
Compare
knz
approved these changes
May 21, 2020
Contributor
knz
left a comment
knz
left a comment
There was a problem hiding this comment.
Awesome.
Please backport to 20.1 as well, but then in that version beware that the default is different.
Contributor
Author
|
Thanks for reviewing! And yes, will do. |
petermattis
approved these changes
May 21, 2020
Collaborator
petermattis
left a comment
petermattis
left a comment
There was a problem hiding this comment.
Reviewable status:
complete! 1 of 0 LGTMs obtained (waiting on @itsbilal and @petermattis)
pkg/server/testserver.go, line 86 at r1 (raw file):
if cfg.StorageEngine == enginepb.EngineTypeDefault { cfg.StorageEngine = enginepb.EngineTypePebble }
I wonder if it would have been less error prone for DefaultStorageEngine to be a function which does the resolution internally. This might be problematic for the --storage-engine flag, though. Sigh.
Contributor
Author
|
Thanks for the reviews! bors r+ |
Contributor
Build failed (retrying...) |
Contributor
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we weren't resolving the engine type if it was
set to EngineTypeDefault in the testserver. This would silently
resolve to Pebble (and in 20.1, rocksdb) anyway, so it was
only a concern in sentry reports where it would show up as
default. Sincecockroach demouses the test server andhas sentry reports enabled, that was an oversight.
Release note (bug fix): Report engine type correctly in bug reports
when using
cockroach demo.