Only log exception when not retrying

felixbarny · Oct 6, 2024 · 212753e · 212753e
1 parent cf23f7c
commit 212753e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
@@ -425,8 +425,6 @@ private static boolean handleMappingUpdateRequired(
                 return true;
             }
         } catch (Exception e) {
-            logger.info(() -> format("%s mapping update rejected by primary", primary.shardId()), e);
-            assert result.getId() != null;
             onMappingUpdateFailure(e, primary, version, result, context, updateResult, initialMappingVersion);
             return true;
         }
@@ -473,6 +471,7 @@ private static void onMappingUpdateFailure(
         long currentMappingVersion = primary.mapperService().mappingVersion();
         boolean mappingWasConcurrentlyUpdated = currentMappingVersion > initialMappingVersion;
         if (mappingWasConcurrentlyUpdated) {
+            logger.debug(() -> format("%s retrying mapping update due to concurrent modification of mappings", primary.shardId()));
             // retry current index request if the mapping was updated concurrently
             // when two index requests race to add a conflicting dynamic mapping for the same field,
             // the index request whose dynamic mapping update loses the race will fail
@@ -481,6 +480,7 @@ private static void onMappingUpdateFailure(
             context.markOperationAsExecuted(r);
             context.resetForMappingUpdateRetry();
         } else {
+            logger.info(() -> format("%s mapping update rejected", primary.shardId()), e);
             onComplete(r, context, updateResult);
         }
     }