Add DB tables & models for blueprint clickhouse clusters #6591
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
andrewjstone
commented
Sep 17, 2024
| use nexus_types::deployment::CockroachDbPreserveDowngrade; | ||
| use nexus_types::deployment::{ | ||
| blueprint_zone_type, BlueprintPhysicalDisksConfig, | ||
| blueprint_zone_type, BlueprintPhysicalDisksConfig, ClickhouseClusterConfig, |
Contributor
Author
There was a problem hiding this comment.
The ClickhouseClusterConfig must be generated from the 3 tables. I plan to do that inside the db-query for blueprints.
jgallagher
approved these changes
Sep 18, 2024
Contributor
jgallagher
left a comment
jgallagher
left a comment
There was a problem hiding this comment.
LGTM, just a couple tiny nits
nexus/db-model/src/deployment.rs
Outdated
| #[diesel(table_name = bp_clickhouse_keeper_zone_id_to_node_id)] | ||
| pub struct BpClickhouseKeeperZoneIdToNodeId { | ||
| pub blueprint_id: Uuid, | ||
| pub omicron_zone_id: Uuid, |
Contributor
There was a problem hiding this comment.
I think this could be DbTypedUuid<OmicronZoneKind> (a la
Uuids below.
Comment on lines
5
to
7
| max_used_keeper_id INT8 NOT NULL | ||
| cluster_name TEXT NOT NULL | ||
| cluster_secret TEXT NOT NULL |
Contributor
There was a problem hiding this comment.
Suggested change
| max_used_keeper_id INT8 NOT NULL | |
| cluster_name TEXT NOT NULL | |
| cluster_secret TEXT NOT NULL | |
| max_used_keeper_id INT8 NOT NULL, | |
| cluster_name TEXT NOT NULL, | |
| cluster_secret TEXT NOT NULL, |
(and the same in dbinit.sql)
Contributor
Author
There was a problem hiding this comment.
Wow, how did I miss that 🤦. I ran the db-model tests and they passed I thought.
Contributor
Author
|
Thanks for the eagle eyed review @jgallagher |
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.
No description provided.