From df0f68da23f64ffc91619c6aa5d1ff2d3f5be4e2 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Mon, 27 Jul 2020 09:34:16 -0600 Subject: [PATCH] Identify the operation type in rejected exception (#60138) Currently, we do not categorize the operation type in the rejection exception messsage when we reject an indexing operation for indexing memory limits. This commit fixes this to ensure that it is identified as coordinating, primary, or replica. --- .../main/java/org/elasticsearch/index/IndexingPressure.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/IndexingPressure.java b/server/src/main/java/org/elasticsearch/index/IndexingPressure.java index 8c2c9cb757d..9efc625b461 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexingPressure.java +++ b/server/src/main/java/org/elasticsearch/index/IndexingPressure.java @@ -68,7 +68,7 @@ public class IndexingPressure { "coordinating_and_primary_bytes=" + bytesWithoutOperation + ", " + "replica_bytes=" + replicaWriteBytes + ", " + "all_bytes=" + totalBytesWithoutOperation + ", " + - "operation_bytes=" + bytes + ", " + + "coordinating_operation_bytes=" + bytes + ", " + "max_coordinating_and_primary_bytes=" + primaryAndCoordinatingLimits + "]", false); } currentCoordinatingBytes.getAndAdd(bytes); @@ -99,7 +99,7 @@ public class IndexingPressure { "coordinating_and_primary_bytes=" + bytesWithoutOperation + ", " + "replica_bytes=" + replicaWriteBytes + ", " + "all_bytes=" + totalBytesWithoutOperation + ", " + - "operation_bytes=" + bytes + ", " + + "primary_operation_bytes=" + bytes + ", " + "max_coordinating_and_primary_bytes=" + primaryAndCoordinatingLimits + "]", false); } currentPrimaryBytes.getAndAdd(bytes);