review nits

oxidecomputer · Aug 22, 2024 · 9f09cb8 · 9f09cb8
1 parent e7e8202
commit 9f09cb8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/nexus/db-queries/src/db/datastore/cockroachdb_settings.rs b/nexus/db-queries/src/db/datastore/cockroachdb_settings.rs
@@ -164,8 +164,9 @@ mod test {
             assert_eq!(version, CockroachDbClusterVersion::POLICY);
         } else {
             panic!(
-                "`cluster.preserve_downgrade_option` should not be {:?}",
-                settings.preserve_downgrade
+                "`cluster.preserve_downgrade_option` is {:?},
+                but it should be empty or \"{}\"",
+                settings.preserve_downgrade, version
             );
         }
 

diff --git a/nexus/src/app/rack.rs b/nexus/src/app/rack.rs
@@ -260,8 +260,11 @@ impl super::Nexus {
                     )?;
                 CockroachDbClusterVersion::NEWLY_INITIALIZED
             } else {
-                // Fill in the blueprint with the current value of the option in
-                // the database.
+                // `cluster.preserve_downgrade_option` is set, so fill in the
+                // blueprint with the current value. This branch should never
+                // be hit during normal rack initialization; it's here for
+                // eventual test cases where `cluster.preserve_downgrade_option`
+                // is set by a test harness prior to rack initialization.
                 CockroachDbClusterVersion::from_str(
                     &cockroachdb_settings.preserve_downgrade,
                 )