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

catalog: fix descriptor validation early exit #62878

Merged
merged 2 commits into from
Apr 2, 2021

Conversation

postamar
Copy link
Contributor

This patch fixes a bug in doctor and crdb_internal.invalid_objects
preventing multiple validation errors originating from different
validation levels from being properly reported.

Release note: None

This patch fixes a bug in doctor and crdb_internal.invalid_objects
preventing multiple validation errors originating from different
validation levels from being properly reported.

Release note: None
@postamar postamar requested a review from a team March 31, 2021 16:22
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@postamar
Copy link
Contributor Author

This bug was introduced by #62546 and I stumbled upon it while fixing a merge conflict for #62803 . I might otherwise never have as it's quite an edge case so I'm not too sad. I added a doctor test case to cover this.

This patch improves the deliberate corruption of the descriptor state in
the `error` suite of the telemetry logic tests.

Release note: None
@postamar
Copy link
Contributor Author

postamar commented Mar 31, 2021

In the same vein of improving the telemetry PR I've added a commit which improves the test cases which I was having trouble backporting to 21.1. These are now more robust in any case.

Copy link
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r1, 1 of 1 files at r2.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @postamar)

@postamar
Copy link
Contributor Author

postamar commented Apr 2, 2021

bors r+

@craig
Copy link
Contributor

craig bot commented Apr 2, 2021

Build succeeded:

@craig craig bot merged commit 65e2090 into cockroachdb:master Apr 2, 2021
@postamar postamar deleted the fix-validation-early-exit branch April 6, 2021 13:20
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