store: Asyncify remaining methods in deployment

Author: lutter

store/postgres/src/deployment.rs

@@ -860,12 +860,12 @@ pub async fn fail(
 ) -> Result<(), StoreError> {
     let error_id = insert_subgraph_error(conn, error).await?;
 
-    update_deployment_status(conn, id, SubgraphHealth::Failed, Some(error_id), None)?;
+    update_deployment_status(conn, id, SubgraphHealth::Failed, Some(error_id), None).await?;
 
     Ok(())
 }
 
-pub fn update_non_fatal_errors(
+pub async fn update_non_fatal_errors(
     conn: &mut PgConnection,
     deployment_id: &DeploymentHash,
     health: SubgraphHealth,
@@ -882,13 +882,13 @@ pub fn update_non_fatal_errors(
             .collect::<Vec<_>>()
     });
 
-    update_deployment_status(conn, deployment_id, health, None, error_ids)?;
+    update_deployment_status(conn, deployment_id, health, None, error_ids).await?;
 
     Ok(())
 }
 
 /// If `block` is `None`, assumes the latest block.
-pub(crate) fn has_deterministic_errors(
+pub(crate) async fn has_deterministic_errors(
     conn: &mut PgConnection,
     id: &DeploymentHash,
     block: BlockNumber,
@@ -904,7 +904,7 @@ pub(crate) fn has_deterministic_errors(
     .map_err(|e| e.into())
 }
 
-pub fn update_deployment_status(
+pub async fn update_deployment_status(
     conn: &mut PgConnection,
     deployment_id: &DeploymentHash,
     health: SubgraphHealth,
@@ -973,7 +973,7 @@ async fn check_health(
 ) -> Result<(), StoreError> {
     use deployment as d;
 
-    let has_errors = has_deterministic_errors(conn, id, block)?;
+    let has_errors = has_deterministic_errors(conn, id, block).await?;
 
     let (new, old) = match has_errors {
         true => {
@@ -999,7 +999,7 @@ async fn check_health(
     .map_err(|e| e.into())
 }
 
-pub(crate) fn health(
+pub(crate) async fn health(
     conn: &mut PgConnection,
     id: DeploymentId,
 ) -> Result<SubgraphHealth, StoreError> {
@@ -1012,7 +1012,7 @@ pub(crate) fn health(
         .map_err(|e| e.into())
 }
 
-pub(crate) fn entities_with_causality_region(
+pub(crate) async fn entities_with_causality_region(
     conn: &mut PgConnection,
     id: DeploymentId,
     schema: &InputSchema,

store/postgres/src/deployment_store.rs

@@ -1201,7 +1201,8 @@ impl DeploymentStore {
                                 &site.deployment,
                                 deployment::SubgraphHealth::Unhealthy,
                                 Some(&batch.deterministic_errors),
-                            )?;
+                            )
+                            .await?;
                         }
                     }
 
@@ -1745,7 +1746,7 @@ impl DeploymentStore {
             use deployment::SubgraphHealth::*;
             // Decide status based on if there are any errors for the previous/parent block
             let prev_health =
-                if deployment::has_deterministic_errors(conn, deployment_id, parent_ptr.number)? {
+                if deployment::has_deterministic_errors(conn, deployment_id, parent_ptr.number).await? {
                     Unhealthy
                 } else {
                     Healthy
@@ -1774,7 +1775,7 @@ impl DeploymentStore {
                     let _ = self.revert_block_operations(site.clone(), parent_ptr.clone(), &FirehoseCursor::None).await?;
 
                     // Unfail the deployment.
-                    deployment::update_deployment_status(conn, deployment_id, prev_health, None,None)?;
+                    deployment::update_deployment_status(conn, deployment_id, prev_health, None,None).await?;
 
                     Ok(UnfailOutcome::Unfailed)
                 }
@@ -1858,7 +1859,7 @@ impl DeploymentStore {
                             deployment::SubgraphHealth::Healthy,
                             None,
                             None,
-                        )?;
+                        ).await?;
 
                         // Delete the fatal error.
                         deployment::delete_error(conn, &subgraph_error.id).await?;
@@ -1931,7 +1932,7 @@ impl DeploymentStore {
         site: &Site,
     ) -> Result<deployment::SubgraphHealth, StoreError> {
         let id = site.id;
-        self.with_conn(async move |conn, _| deployment::health(conn, id).map_err(Into::into))
+        self.with_conn(async move |conn, _| deployment::health(conn, id).await.map_err(Into::into))
             .await
     }
 

store/postgres/src/relational.rs

@@ -1767,7 +1767,7 @@ impl LayoutCache {
     async fn load(conn: &mut PgConnection, site: Arc<Site>) -> Result<Arc<Layout>, StoreError> {
         let (subgraph_schema, use_bytea_prefix) = deployment::schema(conn, site.as_ref()).await?;
         let has_causality_region =
-            deployment::entities_with_causality_region(conn, site.id, &subgraph_schema)?;
+            deployment::entities_with_causality_region(conn, site.id, &subgraph_schema).await?;
         let catalog =
             Catalog::load(conn, site.clone(), use_bytea_prefix, has_causality_region).await?;
         let layout = Arc::new(Layout::new(site.clone(), &subgraph_schema, catalog)?);