tenantcostserver: fix erroneous panic in tests #70094
Merged
Conversation
This file contains 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
|
This change is |
andy-kimball
approved these changes
Sep 12, 2021
There was a problem hiding this comment.
Reviewable status:
complete! 1 of 0 LGTMs obtained (waiting on @ajwerner)
RaduBerinde
force-pushed
the
fix-invariants-panic
branch
from
df074eb
to
51554bf
Compare
ajwerner
approved these changes
Sep 13, 2021
There was a problem hiding this comment.
Reviewable status:
pkg/ccl/multitenantccl/tenantcostserver/system_table.go, line 434 at r2 (raw file):
) if err != nil { log.Warningf(ctx, "checkInvariants query failed: %v", err)
nit: wrap this in if ctx.Err() == nil {...}
The test-only code that checks the invariants of the `tenant_usage` table inadvertently panics if the query hits an error (such as one that would be expected if the server is shutting down). We now just log the error instead. Fixes cockroachdb#70089. Release note: None Release justification: non-production code change to fix test failure.
RaduBerinde
force-pushed
the
fix-invariants-panic
branch
from
51554bf
to
50021ff
Compare
RaduBerinde
commented
Sep 13, 2021
There was a problem hiding this comment.
TFTRs!
bors r+
Reviewable status:
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The test-only code that checks the invariants of the
tenant_usagetable inadvertently panics if the query hits an error (such as one
that would be expected if the server is shutting down). We now just
log the error instead.
Fixes #70089.
Release note: None
Release justification: non-production code change to fix test failure.