Skip to content

Commit 9690c22

Browse files
davepachecodavepacheco
authored
add information about SP-related updates to blueprint (#7975)
1 parent 1cb9fed commit 9690c22

File tree

19 files changed

+507
-4
lines changed

19 files changed

+507
-4
lines changed

‎dev-tools/omdb/tests/successes.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,7 @@ parent: <none>
14231423
internal DNS version: 1
14241424
external DNS version: 2
14251425

1426+
PENDING MGS-MANAGED UPDATES: 0
14261427

14271428
---------------------------------------------
14281429
stderr:
@@ -1519,6 +1520,7 @@ parent: <none>
15191520
internal DNS version: 1
15201521
external DNS version: 2
15211522

1523+
PENDING MGS-MANAGED UPDATES: 0
15221524

15231525
---------------------------------------------
15241526
stderr:

‎dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
358358
internal DNS version: 1
359359
external DNS version: 1
360360

361+
PENDING MGS-MANAGED UPDATES: 0
361362

362363

363364
>
@@ -453,5 +454,6 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
453454
internal DNS version: 1
454455
external DNS version: 1
455456

457+
PENDING MGS-MANAGED UPDATES: 0
456458

457459

‎dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
302302
internal DNS version: 1
303303
external DNS version: 1
304304

305+
PENDING MGS-MANAGED UPDATES: 0
305306

306307

307308
> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739
@@ -605,6 +606,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
605606
internal DNS version: 1
606607
external DNS version: 1
607608

609+
PENDING MGS-MANAGED UPDATES: 0
608610

609611

610612
> blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0
@@ -922,6 +924,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
922924
internal DNS version: 1
923925
external DNS version: 1
924926

927+
PENDING MGS-MANAGED UPDATES: 0
925928

926929

927930
> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5

‎dev-tools/reconfigurator-cli/tests/output/cmd-set-zone-images-stdout

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ parent: 1b013011-2062-4b48-b544-a32b23bce83a
9494
internal DNS version: 1
9595
external DNS version: 1
9696

97+
PENDING MGS-MANAGED UPDATES: 0
9798

9899

99100
>
@@ -198,6 +199,7 @@ parent: 9766ca20-38d4-4380-b005-e7c43c797e7c
198199
internal DNS version: 1
199200
external DNS version: 1
200201

202+
PENDING MGS-MANAGED UPDATES: 0
201203

202204

203205
> blueprint-diff 971eeb12-1830-4fa0-a699-98ea0164505c f714e6ea-e85a-4d7d-93c2-a018744fe176
@@ -470,6 +472,7 @@ parent: bb128f06-a2e1-44c1-8874-4f789d0ff896
470472
internal DNS version: 1
471473
external DNS version: 1
472474

475+
PENDING MGS-MANAGED UPDATES: 0
473476

474477

475478
> blueprint-diff f714e6ea-e85a-4d7d-93c2-a018744fe176 d9c572a1-a68c-4945-b1ec-5389bd588fe9

‎nexus/db-queries/src/db/datastore/deployment.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ use nexus_types::deployment::BlueprintSledConfig;
5959
use nexus_types::deployment::BlueprintTarget;
6060
use nexus_types::deployment::ClickhouseClusterConfig;
6161
use nexus_types::deployment::CockroachDbPreserveDowngrade;
62+
use nexus_types::deployment::PendingMgsUpdates;
6263
use omicron_common::api::external::DataPageParams;
6364
use omicron_common::api::external::Error;
6465
use omicron_common::api::external::ListResultVec;
@@ -892,6 +893,9 @@ impl DataStore {
892893

893894
Ok(Blueprint {
894895
id: blueprint_id,
896+
// TODO these need to be serialized to the database.
897+
// See oxidecomputer/omicron#7981.
898+
pending_mgs_updates: PendingMgsUpdates::new(),
895899
sleds: sled_configs,
896900
parent_blueprint_id,
897901
internal_dns_version,

‎nexus/db-queries/src/db/datastore/rack.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,7 @@ mod test {
10121012
use nexus_sled_agent_shared::inventory::OmicronZoneDataset;
10131013
use nexus_types::deployment::BlueprintSledConfig;
10141014
use nexus_types::deployment::CockroachDbPreserveDowngrade;
1015+
use nexus_types::deployment::PendingMgsUpdates;
10151016
use nexus_types::deployment::{
10161017
BlueprintZoneConfig, OmicronZoneExternalFloatingAddr,
10171018
OmicronZoneExternalFloatingIp,
@@ -1054,6 +1055,7 @@ mod test {
10541055
blueprint: Blueprint {
10551056
id: BlueprintUuid::new_v4(),
10561057
sleds: BTreeMap::new(),
1058+
pending_mgs_updates: PendingMgsUpdates::new(),
10571059
cockroachdb_setting_preserve_downgrade:
10581060
CockroachDbPreserveDowngrade::DoNotModify,
10591061
parent_blueprint_id: None,
@@ -1539,6 +1541,7 @@ mod test {
15391541
let blueprint = Blueprint {
15401542
id: BlueprintUuid::new_v4(),
15411543
sleds: make_sled_config_only_zones(blueprint_zones),
1544+
pending_mgs_updates: PendingMgsUpdates::new(),
15421545
cockroachdb_setting_preserve_downgrade:
15431546
CockroachDbPreserveDowngrade::DoNotModify,
15441547
parent_blueprint_id: None,
@@ -1796,6 +1799,7 @@ mod test {
17961799
let blueprint = Blueprint {
17971800
id: BlueprintUuid::new_v4(),
17981801
sleds: make_sled_config_only_zones(blueprint_zones),
1802+
pending_mgs_updates: PendingMgsUpdates::new(),
17991803
cockroachdb_setting_preserve_downgrade:
18001804
CockroachDbPreserveDowngrade::DoNotModify,
18011805
parent_blueprint_id: None,
@@ -2002,6 +2006,7 @@ mod test {
20022006
let blueprint = Blueprint {
20032007
id: BlueprintUuid::new_v4(),
20042008
sleds: make_sled_config_only_zones(blueprint_zones),
2009+
pending_mgs_updates: PendingMgsUpdates::new(),
20052010
cockroachdb_setting_preserve_downgrade:
20062011
CockroachDbPreserveDowngrade::DoNotModify,
20072012
parent_blueprint_id: None,
@@ -2138,6 +2143,7 @@ mod test {
21382143
let blueprint = Blueprint {
21392144
id: BlueprintUuid::new_v4(),
21402145
sleds: make_sled_config_only_zones(blueprint_zones),
2146+
pending_mgs_updates: PendingMgsUpdates::new(),
21412147
cockroachdb_setting_preserve_downgrade:
21422148
CockroachDbPreserveDowngrade::DoNotModify,
21432149
parent_blueprint_id: None,

‎nexus/reconfigurator/execution/src/dns.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ mod test {
339339
pub use nexus_types::deployment::OmicronZoneExternalFloatingAddr;
340340
pub use nexus_types::deployment::OmicronZoneExternalFloatingIp;
341341
pub use nexus_types::deployment::OmicronZoneExternalSnatIp;
342+
use nexus_types::deployment::PendingMgsUpdates;
342343
use nexus_types::deployment::SledFilter;
343344
use nexus_types::deployment::blueprint_zone_type;
344345
use nexus_types::external_api::params;
@@ -688,6 +689,7 @@ mod test {
688689
let mut blueprint = Blueprint {
689690
id: BlueprintUuid::new_v4(),
690691
sleds: blueprint_sleds,
692+
pending_mgs_updates: PendingMgsUpdates::new(),
691693
cockroachdb_setting_preserve_downgrade:
692694
CockroachDbPreserveDowngrade::DoNotModify,
693695
parent_blueprint_id: None,

‎nexus/reconfigurator/planning/src/blueprint_builder/builder.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ use thiserror::Error;
8383

8484
use super::ClickhouseZonesThatShouldBeRunning;
8585
use super::clickhouse::ClickhouseAllocator;
86+
use nexus_types::deployment::PendingMgsUpdates;
8687

8788
/// Errors encountered while assembling blueprints
8889
#[derive(Debug, Error)]
@@ -454,6 +455,7 @@ impl<'a> BlueprintBuilder<'a> {
454455
Blueprint {
455456
id: rng.next_blueprint(),
456457
sleds,
458+
pending_mgs_updates: PendingMgsUpdates::new(),
457459
parent_blueprint_id: None,
458460
internal_dns_version: Generation::new(),
459461
external_dns_version: Generation::new(),
@@ -688,6 +690,10 @@ impl<'a> BlueprintBuilder<'a> {
688690
Blueprint {
689691
id: blueprint_id,
690692
sleds,
693+
pending_mgs_updates: self
694+
.parent_blueprint
695+
.pending_mgs_updates
696+
.clone(),
691697
parent_blueprint_id: Some(self.parent_blueprint.id),
692698
internal_dns_version: self.input.internal_dns_version(),
693699
external_dns_version: self.input.external_dns_version(),

‎nexus/reconfigurator/planning/tests/output/example_builder_zone_counts_blueprint.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,3 +487,4 @@ parent: e35b2fdd-354d-48d9-acb5-703b2c269a54
487487
internal DNS version: 1
488488
external DNS version: 1
489489

490+
PENDING MGS-MANAGED UPDATES: 0

‎nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,4 @@ parent: 516e80a3-b362-4fac-bd3c-4559717120dd
294294
internal DNS version: 1
295295
external DNS version: 1
296296

297+
PENDING MGS-MANAGED UPDATES: 0

‎nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,3 +466,4 @@ parent: 4d4e6c38-cd95-4c4e-8f45-6af4d686964b
466466
internal DNS version: 1
467467
external DNS version: 1
468468

469+
PENDING MGS-MANAGED UPDATES: 0

‎nexus/src/app/background/tasks/blueprint_execution.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ mod test {
190190
use nexus_types::deployment::{
191191
Blueprint, BlueprintSledConfig, BlueprintTarget, BlueprintZoneConfig,
192192
BlueprintZoneDisposition, BlueprintZoneImageSource, BlueprintZoneType,
193-
CockroachDbPreserveDowngrade, blueprint_zone_type,
193+
CockroachDbPreserveDowngrade, PendingMgsUpdates, blueprint_zone_type,
194194
};
195195
use nexus_types::external_api::views::SledState;
196196
use omicron_common::api::external;
@@ -253,6 +253,7 @@ mod test {
253253
let blueprint = Blueprint {
254254
id,
255255
sleds: blueprint_sleds,
256+
pending_mgs_updates: PendingMgsUpdates::new(),
256257
cockroachdb_setting_preserve_downgrade:
257258
CockroachDbPreserveDowngrade::DoNotModify,
258259
parent_blueprint_id: Some(current_target.target_id),

‎nexus/src/app/background/tasks/blueprint_load.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ mod test {
195195
use nexus_test_utils_macros::nexus_test;
196196
use nexus_types::deployment::{
197197
Blueprint, BlueprintTarget, CockroachDbPreserveDowngrade,
198+
PendingMgsUpdates,
198199
};
199200
use omicron_common::api::external::Generation;
200201
use omicron_uuid_kinds::BlueprintUuid;
@@ -217,6 +218,7 @@ mod test {
217218
Blueprint {
218219
id,
219220
sleds: BTreeMap::new(),
221+
pending_mgs_updates: PendingMgsUpdates::new(),
220222
cockroachdb_setting_preserve_downgrade:
221223
CockroachDbPreserveDowngrade::DoNotModify,
222224
parent_blueprint_id: Some(parent_blueprint_id),

‎nexus/test-utils/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ use std::sync::Arc;
9898
use std::time::Duration;
9999
use uuid::Uuid;
100100

101+
use nexus_types::deployment::PendingMgsUpdates;
101102
pub use sim::TEST_HARDWARE_THREADS;
102103
pub use sim::TEST_RESERVOIR_RAM;
103104

@@ -940,6 +941,7 @@ impl<'a, N: NexusServer> ControlPlaneTestContextBuilder<'a, N> {
940941
Blueprint {
941942
id: BlueprintUuid::new_v4(),
942943
sleds: blueprint_sleds,
944+
pending_mgs_updates: PendingMgsUpdates::new(),
943945
parent_blueprint_id: None,
944946
internal_dns_version: dns_config.generation,
945947
external_dns_version: Generation::new(),

0 commit comments

Comments
 (0)