1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index 6dc31eeaf6..243577ecc6 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -607,8 +607,14 @@ public final class ParallelEvaluator implements Evaluator {
     }
 
     @Override
-    protected boolean isCriticalError(Throwable e) {
-      return e instanceof RuntimeException;
+    protected ErrorClassification classifyError(Throwable e) {
+      if (e instanceof SchedulerException) {
+        return ErrorClassification.CRITICAL;
+      }
+      if (e instanceof RuntimeException) {
+        return ErrorClassification.CRITICAL_AND_LOG;
+      }
+      return ErrorClassification.NOT_CRITICAL;
     }
 
     protected void waitForCompletion() throws InterruptedException {