Review comments

Author: fcofdez

server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java

@@ -143,15 +143,12 @@ protected Releasable checkPrimaryLimits(Request request, boolean rerouteWasLocal
             // If this primary request was received from a local reroute initiated by the node client, we
             // must mark a new primary operation local to the coordinating node.
             if (localRerouteInitiatedByNodeClient) {
-                indexingPressure.checkLargestPrimaryOperationIsWithinLimits(
+                return indexingPressure.validateAndMarkPrimaryOperationLocalToCoordinatingNodeStarted(
                     primaryOperationCount(request),
+                    primaryOperationSize(request),
                     primaryLargestOperationSize(request),
                     primaryAllowsOperationsBeyondSizeLimit(request)
                 );
-                return indexingPressure.markPrimaryOperationLocalToCoordinatingNodeStarted(
-                    primaryOperationCount(request),
-                    primaryOperationSize(request)
-                );
             } else {
                 return () -> {};
             }

server/src/main/java/org/elasticsearch/index/IndexingPressure.java

@@ -193,7 +193,13 @@ public Releasable markCoordinatingOperationStarted(int operations, long bytes, b
         });
     }
 
-    public Releasable markPrimaryOperationLocalToCoordinatingNodeStarted(int operations, long bytes) {
+    public Releasable validateAndMarkPrimaryOperationLocalToCoordinatingNodeStarted(
+        int operations,
+        long bytes,
+        long largestOperationSizeInBytes,
+        boolean allowsOperationsBeyondSizeLimit
+    ) {
+        checkLargestPrimaryOperationIsWithinLimits(operations, largestOperationSizeInBytes, allowsOperationsBeyondSizeLimit);
         currentPrimaryBytes.getAndAdd(bytes);
         currentPrimaryOps.getAndAdd(operations);
         totalPrimaryBytes.getAndAdd(bytes);
@@ -204,7 +210,7 @@ public Releasable markPrimaryOperationLocalToCoordinatingNodeStarted(int operati
         });
     }
 
-    public void checkLargestPrimaryOperationIsWithinLimits(
+    void checkLargestPrimaryOperationIsWithinLimits(
         int operations,
         long largestOperationSizeInBytes,
         boolean allowsOperationsBeyondSizeLimit

server/src/test/java/org/elasticsearch/index/IndexingPressureTests.java

@@ -124,7 +124,7 @@ public void testAvoidDoubleMemoryAccounting() {
         IndexingPressure indexingPressure = new IndexingPressure(settings);
         try (
             Releasable coordinating = indexingPressure.markCoordinatingOperationStarted(1, 10, false);
-            Releasable primary = indexingPressure.markPrimaryOperationLocalToCoordinatingNodeStarted(1, 15)
+            Releasable primary = indexingPressure.validateAndMarkPrimaryOperationLocalToCoordinatingNodeStarted(1, 15, 15, true)
         ) {
             IndexingPressureStats stats = indexingPressure.stats();
             assertEquals(10, stats.getCurrentCoordinatingBytes());
@@ -170,7 +170,7 @@ public void testCoordinatingPrimaryRejections() {
 
             // Local to coordinating node primary actions not rejected
             IndexingPressureStats preLocalStats = indexingPressure.stats();
-            Releasable local = indexingPressure.markPrimaryOperationLocalToCoordinatingNodeStarted(1, 1024 * 2);
+            Releasable local = indexingPressure.validateAndMarkPrimaryOperationLocalToCoordinatingNodeStarted(1, 1024 * 2, 1024 * 2, true);
             assertEquals(preLocalStats.getPrimaryRejections(), indexingPressure.stats().getPrimaryRejections());
             assertEquals(1024 * 6, indexingPressure.stats().getCurrentCombinedCoordinatingAndPrimaryBytes());
             assertEquals(preLocalStats.getCurrentPrimaryBytes() + 1024 * 2, indexingPressure.stats().getCurrentPrimaryBytes());