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.

Sign up for GitHub

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

Move instance/VMM table schema upgrade to version 7.0.0 #4270

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Move instance/VMM table schema upgrade to version 7.0.0 #4270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev-tools/omdb/tests/env.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sim-b6d65341 [::1]:REDACTED_PORT - REDACTED_UUID_REDACTED_UUID_REDACTED
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "--db-url", "junk", "sleds"]
termination: Exited(2)
Expand Down Expand Up @@ -172,7 +172,7 @@ stderr:
note: database URL not specified. Will search DNS.
note: (override with --db-url or OMDB_DB_URL)
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["--dns-server", "[::1]:REDACTED_PORT", "db", "sleds"]
termination: Exited(0)
Expand All @@ -185,5 +185,5 @@ stderr:
note: database URL not specified. Will search DNS.
note: (override with --db-url or OMDB_DB_URL)
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
12 changes: 6 additions & 6 deletions dev-tools/omdb/tests/successes.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ external oxide-dev.test 2 <REDACTED_TIMESTAMP> create silo: "tes
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "dns", "diff", "external", "2"]
termination: Exited(0)
Expand All @@ -24,7 +24,7 @@ changes: names added: 1, names removed: 0
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "dns", "names", "external", "2"]
termination: Exited(0)
Expand All @@ -36,7 +36,7 @@ External zone: oxide-dev.test
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "services", "list-instances"]
termination: Exited(0)
Expand All @@ -52,7 +52,7 @@ Nexus REDACTED_UUID_REDACTED_UUID_REDACTED [::ffff:127.0.0.1]:REDACTED_
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "services", "list-by-sled"]
termination: Exited(0)
Expand All @@ -71,7 +71,7 @@ sled: sim-b6d65341 (id REDACTED_UUID_REDACTED_UUID_REDACTED)
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["db", "sleds"]
termination: Exited(0)
Expand All @@ -82,7 +82,7 @@ sim-b6d65341 [::1]:REDACTED_PORT - REDACTED_UUID_REDACTED_UUID_REDACTED
---------------------------------------------
stderr:
note: using database URL postgresql://root@[::1]:REDACTED_PORT/omicron?sslmode=disable
note: database schema version matches expected (6.0.0)
note: database schema version matches expected (7.0.0)
=============================================
EXECUTING COMMAND: omdb ["mgs", "inventory"]
termination: Exited(0)
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-model/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ table! {
///
/// This should be updated whenever the schema is changed. For more details,
/// refer to: schema/crdb/README.adoc
pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(6, 0, 0);
pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(7, 0, 0);

allow_tables_to_appear_in_same_query!(
system_update,
Expand Down
0 schema/crdb/6.0.0/README.adoc → schema/crdb/7.0.0/README.adoc
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up01.sql → schema/crdb/7.0.0/up1.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up02.sql → schema/crdb/7.0.0/up2.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up03.sql → schema/crdb/7.0.0/up3.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up04.sql → schema/crdb/7.0.0/up4.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up05.sql → schema/crdb/7.0.0/up5.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up06.sql → schema/crdb/7.0.0/up6.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up07.sql → schema/crdb/7.0.0/up7.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up08.sql → schema/crdb/7.0.0/up8.sql
View file
Open in desktop
File renamed without changes.
0 schema/crdb/6.0.0/up09.sql → schema/crdb/7.0.0/up9.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion schema/crdb/dbinit.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,7 +2539,7 @@ INSERT INTO omicron.public.db_metadata (
version,
target_version
) VALUES
( TRUE, NOW(), NOW(), '6.0.0', NULL)
( TRUE, NOW(), NOW(), '7.0.0', NULL)
ON CONFLICT DO NOTHING;


Expand Down