[catalog] Fix upgrade checker to handle changes to Builtin Tables and Sources #32043
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
SangJunBak
reviewed
Mar 28, 2025
Comment on lines
+708
to
+713
| // If in the new version a BuiltinTable or BuiltinSource is changed (e.g. a new | ||
| // column is added) then we'll potentially have a new shard, but no writes will | ||
| // have occurred so no schema will be registered. | ||
| let Some((_schema_id, persisted_relation_desc, _)) = persisted_schema else { | ||
| anyhow::bail!("no schema found for {gid}: {shard_id}, did their environment crash?"); | ||
| println!("no schema found for {gid} '{shard_id}', continuing..."); | ||
| continue; |
There was a problem hiding this comment.
Are there any repercussions of not anyhow::bailing if if a user's persist relation doesn't have a shard?
There was a problem hiding this comment.
There shouldn't be! The only other case that this might occur is if a shard was created (e.g. a table was created) and then environmentd immediately crashed. Although on restart environmentd will register a schema, so we should be fine here.
|
TFTR! |
ParkMyCar
added a commit
that referenced
this pull request
Mar 28, 2025
… Sources (#32043) This PR fixes the Catalog Upgrade Checker to handle the scenario when builtin tables and sources are either updated (e.g. a column is added) or newly created. ### Motivation Fix the catalog upgrade checker so we get better validation of upgrades ### Checklist - [ ] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [ ] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [ ] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [ ] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [ ] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
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.
This PR fixes the Catalog Upgrade Checker to handle the scenario when builtin tables and sources are either updated (e.g. a column is added) or newly created.
Motivation
Fix the catalog upgrade checker so we get better validation of upgrades
Checklist
$T ⇔ Proto$Tmapping (possibly in a backwards-incompatible way), then it is tagged with aT-protolabel.