treat resource not found and illegal argument exceptions as irrecover…

…able error relates elastic#50135
hendrikmuhs · Feb 3, 2020 · 864d9b4 · 864d9b4
1 parent 28dbee5
commit 864d9b4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/...rm/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java b/...rm/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java
@@ -174,7 +174,7 @@ protected void doNextBulk(BulkRequest request, ActionListener<BulkResponse> next
                     // Determine whether the failure is irrecoverable (transform should go into failed state) or not (transform increments
                     // the indexing failure counter
                     // and possibly retries)
-                    Exception irrecoverableException = ExceptionRootCauseFinder.getFirstIrrecoverableExceptionFromBulkResponses(
+                    Throwable irrecoverableException = ExceptionRootCauseFinder.getFirstIrrecoverableExceptionFromBulkResponses(
                         deduplicatedFailures.values()
                     );
                     if (irrecoverableException == null) {
@@ -373,7 +373,7 @@ private static String getBulkIndexDetailedFailureMessage(String prefix, Map<Stri
         return failureMessage;
     }
 
-    private static Exception decorateBulkIndexException(Exception irrecoverableException) {
+    private static Throwable decorateBulkIndexException(Throwable irrecoverableException) {
         if (irrecoverableException instanceof MapperParsingException) {
             return new TransformException(
                 "Destination index mappings are incompatible with the transform configuration.",

diff --git a/...ransform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java b/...ransform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java
@@ -484,28 +484,30 @@ synchronized void handleFailure(Exception e) {
             handleIrrecoverableBulkIndexingException((BulkIndexingException) unwrappedException);
         } else if (unwrappedException instanceof IndexNotFoundException
             || unwrappedException instanceof AggregationResultUtils.AggregationExtractionException
-            || unwrappedException instanceof TransformConfigReloadingException) {
-            failIndexer("task encountered irrecoverable failure: " + e.getMessage());
-        } else if (context.getAndIncrementFailureCount() > context.getNumFailureRetries()) {
-            failIndexer(
-                "task encountered more than "
-                    + context.getNumFailureRetries()
-                    + " failures; latest failure: "
-                    + ExceptionRootCauseFinder.getDetailedMessage(unwrappedException)
-            );
-        } else {
-            // Since our schedule fires again very quickly after failures it is possible to run into the same failure numerous
-            // times in a row, very quickly. We do not want to spam the audit log with repeated failures, so only record the first one
-            if (e.getMessage().equals(lastAuditedExceptionMessage) == false) {
-                String message = ExceptionRootCauseFinder.getDetailedMessage(unwrappedException);
-
-                auditor.warning(
-                    getJobId(),
-                    "Transform encountered an exception: " + message + " Will attempt again at next scheduled trigger."
+            || unwrappedException instanceof TransformConfigReloadingException
+            || unwrappedException instanceof ResourceNotFoundException
+            || unwrappedException instanceof IllegalArgumentException) {
+                failIndexer("task encountered irrecoverable failure: " + e.getMessage());
+            } else if (context.getAndIncrementFailureCount() > context.getNumFailureRetries()) {
+                failIndexer(
+                    "task encountered more than "
+                        + context.getNumFailureRetries()
+                        + " failures; latest failure: "
+                        + ExceptionRootCauseFinder.getDetailedMessage(unwrappedException)
                 );
-                lastAuditedExceptionMessage = message;
+            } else {
+                // Since our schedule fires again very quickly after failures it is possible to run into the same failure numerous
+                // times in a row, very quickly. We do not want to spam the audit log with repeated failures, so only record the first one
+                if (e.getMessage().equals(lastAuditedExceptionMessage) == false) {
+                    String message = ExceptionRootCauseFinder.getDetailedMessage(unwrappedException);
+
+                    auditor.warning(
+                        getJobId(),
+                        "Transform encountered an exception: " + message + " Will attempt again at next scheduled trigger."
+                    );
+                    lastAuditedExceptionMessage = message;
+                }
             }
-        }
     }
 
     /**

diff --git a/...sform/src/main/java/org/elasticsearch/xpack/transform/utils/ExceptionRootCauseFinder.java b/...sform/src/main/java/org/elasticsearch/xpack/transform/utils/ExceptionRootCauseFinder.java
@@ -7,6 +7,7 @@
 package org.elasticsearch.xpack.transform.utils;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.ShardSearchFailure;
@@ -63,10 +64,13 @@ public static String getDetailedMessage(Throwable t) {
      * @param failures a collection of bulk item responses
      * @return The first exception considered irrecoverable if there are any, null if no irrecoverable exception found
      */
-    public static Exception getFirstIrrecoverableExceptionFromBulkResponses(Collection<BulkItemResponse> failures) {
+    public static Throwable getFirstIrrecoverableExceptionFromBulkResponses(Collection<BulkItemResponse> failures) {
         for (BulkItemResponse failure : failures) {
-            if (failure.getFailure().getCause() instanceof MapperParsingException) {
-                return failure.getFailure().getCause();
+            Throwable unwrappedThrowable = org.elasticsearch.ExceptionsHelper.unwrapCause(failure.getFailure().getCause());
+            if (unwrappedThrowable instanceof MapperParsingException
+                || unwrappedThrowable instanceof IllegalArgumentException
+                || unwrappedThrowable instanceof ResourceNotFoundException) {
+                return unwrappedThrowable;
             }
         }