Update nonFatalErrors in subgraphs.subgraph_deployment table

store/test-store/src/store.rs

@@ -207,11 +207,14 @@ pub fn remove_subgraph(id: &DeploymentHash) {
 }
 
 /// Transact errors for this block and wait until changes have been written
+/// Takes store, deployment, block ptr to, errors, and a bool indicating whether
+/// nonFatalErrors are active
 pub async fn transact_errors(
     store: &Arc<Store>,
     deployment: &DeploymentLocator,
     block_ptr_to: BlockPtr,
     errs: Vec<SubgraphError>,
+    is_non_fatal_errors_active: bool,
 ) -> Result<(), StoreError> {
     let metrics_registry = Arc::new(MetricsRegistry::mock());
     let stopwatch_metrics = StopwatchMetrics::new(
@@ -232,7 +235,7 @@ pub async fn transact_errors(
             Vec::new(),
             errs,
             Vec::new(),
-            false,
+            is_non_fatal_errors_active,
         )
         .await?;
     flush(deployment).await

store/test-store/tests/chain/ethereum/manifest.rs

@@ -225,6 +225,7 @@ specVersion: 0.0.2
             &deployment,
             test_store::BLOCKS[1].clone(),
             vec![error],
+            false,
         )
         .await
         .unwrap();
@@ -336,6 +337,7 @@ specVersion: 0.0.2
             &deployment,
             test_store::BLOCKS[1].clone(),
             vec![error],
+            false,
         )
         .await
         .unwrap();

store/test-store/tests/graphql/query.rs

@@ -2439,7 +2439,7 @@ fn non_fatal_errors() {
             deterministic: true,
         };
 
-        transact_errors(&STORE, &deployment, BLOCK_TWO.block_ptr(), vec![err])
+        transact_errors(&STORE, &deployment, BLOCK_TWO.block_ptr(), vec![err], true)
             .await
             .unwrap();
 
@@ -2545,7 +2545,7 @@ fn deterministic_error() {
             deterministic: true,
         };
 
-        transact_errors(&STORE, &deployment, BLOCK_TWO.block_ptr(), vec![err])
+        transact_errors(&STORE, &deployment, BLOCK_TWO.block_ptr(), vec![err], false)
             .await
             .unwrap();
 

store/test-store/tests/postgres/subgraph.rs

@@ -506,7 +506,7 @@ fn subgraph_error() {
 
         assert!(count() == 0);
 
-        transact_errors(&store, &deployment, BLOCKS[1].clone(), vec![error])
+        transact_errors(&store, &deployment, BLOCKS[1].clone(), vec![error], false)
             .await
             .unwrap();
         assert!(count() == 1);
@@ -520,7 +520,7 @@ fn subgraph_error() {
         };
 
         // Inserting the same error is allowed but ignored.
-        transact_errors(&store, &deployment, BLOCKS[2].clone(), vec![error])
+        transact_errors(&store, &deployment, BLOCKS[2].clone(), vec![error], false)
             .await
             .unwrap();
         assert!(count() == 1);
@@ -533,7 +533,7 @@ fn subgraph_error() {
             deterministic: false,
         };
 
-        transact_errors(&store, &deployment, BLOCKS[3].clone(), vec![error2])
+        transact_errors(&store, &deployment, BLOCKS[3].clone(), vec![error2], false)
             .await
             .unwrap();
         assert!(count() == 2);
@@ -542,6 +542,64 @@ fn subgraph_error() {
     })
 }
 
+#[test]
+fn subgraph_non_fatal_error() {
+    test_store::run_test_sequentially(|store| async move {
+        let subgraph_store = store.subgraph_store();
+        let subgraph_id = DeploymentHash::new("subgraph_non_fatal_error").unwrap();
+        let deployment =
+            test_store::create_test_subgraph(&subgraph_id, "type Foo { id: ID! }").await;
+
+        let count = || -> usize {
+            let store = store.subgraph_store();
+            let count = store.error_count(&subgraph_id).unwrap();
+            println!("count: {}", count);
+            count
+        };
+
+        let error = SubgraphError {
+            subgraph_id: subgraph_id.clone(),
+            message: "test".to_string(),
+            block_ptr: Some(BLOCKS[1].clone()),
+            handler: None,
+            deterministic: true,
+        };
+
+        assert!(count() == 0);
+
+        transact_errors(&store, &deployment, BLOCKS[1].clone(), vec![error], true)
+            .await
+            .unwrap();
+        assert!(count() == 1);
+
+        let info = subgraph_store.status_for_id(deployment.id);
+
+        assert!(info.non_fatal_errors.len() == 1);
+        assert!(info.health == SubgraphHealth::Unhealthy);
+
+        let error2 = SubgraphError {
+            subgraph_id: subgraph_id.clone(),
+            message: "test2".to_string(),
+            block_ptr: None,
+            handler: None,
+            deterministic: false,
+        };
+
+        // Inserting non deterministic errors will increase error count but not count of non fatal errors
+        transact_errors(&store, &deployment, BLOCKS[2].clone(), vec![error2], false)
+            .await
+            .unwrap();
+        assert!(count() == 2);
+
+        let info = subgraph_store.status_for_id(deployment.id);
+
+        assert!(info.non_fatal_errors.len() == 1);
+        assert!(info.health == SubgraphHealth::Unhealthy);
+
+        test_store::remove_subgraph(&subgraph_id);
+    })
+}
+
 #[test]
 fn fatal_vs_non_fatal() {
     async fn setup() -> DeploymentLocator {
@@ -592,7 +650,7 @@ fn fatal_vs_non_fatal() {
             .await
             .unwrap());
 
-        transact_errors(&store, &deployment, BLOCKS[1].clone(), vec![error()])
+        transact_errors(&store, &deployment, BLOCKS[1].clone(), vec![error()], false)
             .await
             .unwrap();