do latest blueprint time properly, add index on time_created

Author: david-crespo

nexus/db-model/src/schema_versions.rs

@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-pub const SCHEMA_VERSION: Version = Version::new(189, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(190, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
+        KnownVersion::new(190, "blueprint-time-created-index"),
         KnownVersion::new(189, "reconfigurator-chicken-switches-to-config"),
         KnownVersion::new(188, "positive-quotas"),
         KnownVersion::new(187, "no-default-pool-for-internal-silo"),

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

@@ -137,6 +137,26 @@ impl DataStore {
         Ok(blueprints.into_iter().map(BlueprintMetadata::from).collect())
     }
 
+    /// Get the time of the most recently created blueprint
+    pub async fn blueprint_get_latest_time(
+        &self,
+        opctx: &OpContext,
+    ) -> Result<Option<DateTime<Utc>>, Error> {
+        use nexus_db_schema::schema::blueprint;
+
+        opctx
+            .authorize(authz::Action::ListChildren, &authz::BLUEPRINT_CONFIG)
+            .await?;
+
+        let latest_time = blueprint::table
+            .select(diesel::dsl::max(blueprint::time_created))
+            .get_result_async(&*self.pool_connection_authorized(opctx).await?)
+            .await
+            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
+
+        Ok(latest_time)
+    }
+
     /// Store a complete blueprint into the database
     pub async fn blueprint_insert(
         &self,

nexus/src/app/update.rs

@@ -169,8 +169,11 @@ impl super::Nexus {
         let components_by_release =
             self.get_component_status_readonly(opctx).await?;
 
-        // Get last blueprint time
-        let last_blueprint_time = self.get_last_blueprint_time(opctx).await?;
+        let last_blueprint_time = self
+            .datastore()
+            .blueprint_get_latest_time(opctx)
+            .await
+            .map_err(HttpError::from)?;
 
         // Generate blockers (placeholder for now)
         let blockers = self.generate_blockers(opctx).await?;
@@ -183,25 +186,6 @@ impl super::Nexus {
         })
     }
 
-    /// Get the time of the most recently created blueprint
-    async fn get_last_blueprint_time(
-        &self,
-        opctx: &OpContext,
-    ) -> Result<Option<chrono::DateTime<chrono::Utc>>, HttpError> {
-        use omicron_common::api::external::DataPageParams;
-
-        let blueprints = self
-            .datastore()
-            .blueprints_list(opctx, &DataPageParams::max_page())
-            .await
-            .map_err(HttpError::from)?;
-
-        let latest_time =
-            blueprints.into_iter().map(|bp| bp.time_created).max();
-
-        Ok(latest_time)
-    }
-
     /// Generate list of blockers (placeholder implementation)
     async fn generate_blockers(
         &self,

schema/crdb/blueprint-time-created-index/up01.sql

@@ -0,0 +1,3 @@
+CREATE INDEX IF NOT EXISTS lookup_blueprint_by_creation ON omicron.public.blueprint (
+    time_created
+);

schema/crdb/dbinit.sql

@@ -4545,6 +4545,10 @@ CREATE TABLE IF NOT EXISTS omicron.public.blueprint (
     nexus_generation INT8 NOT NULL
 );
 
+CREATE INDEX IF NOT EXISTS lookup_blueprint_by_creation ON omicron.public.blueprint (
+    time_created
+);
+
 -- table describing both the current and historical target blueprints of the
 -- system
 CREATE TABLE IF NOT EXISTS omicron.public.bp_target (
@@ -6617,7 +6621,7 @@ INSERT INTO omicron.public.db_metadata (
     version,
     target_version
 ) VALUES
-    (TRUE, NOW(), NOW(), '189.0.0', NULL)
+    (TRUE, NOW(), NOW(), '190.0.0', NULL)
 ON CONFLICT DO NOTHING;
 
 COMMIT;