From d0edd13f7bd8f87053faa94891c6a5a775b4d689 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 11 May 2016 10:37:23 -0400 Subject: [PATCH] Log setting key not setting object in IMC This commit modifies two logging statements in the IndexingMemoryController to log the key for the setting indices.memory.index_buffer_size instead of the object. Relates #18191 --- .../org/elasticsearch/indices/IndexingMemoryController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java index 87035044297..b47172bb0ae 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java +++ b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java @@ -314,7 +314,7 @@ public class IndexingMemoryController extends AbstractComponent implements Index if (logger.isTraceEnabled()) { logger.trace("total indexing heap bytes used [{}] vs {} [{}], currently writing bytes [{}]", - new ByteSizeValue(totalBytesUsed), INDEX_BUFFER_SIZE_SETTING, indexingBuffer, new ByteSizeValue(totalBytesWriting)); + new ByteSizeValue(totalBytesUsed), INDEX_BUFFER_SIZE_SETTING.getKey(), indexingBuffer, new ByteSizeValue(totalBytesWriting)); } // If we are using more than 50% of our budget across both indexing buffer and bytes we are still moving to disk, then we now @@ -354,7 +354,7 @@ public class IndexingMemoryController extends AbstractComponent implements Index } logger.debug("now write some indexing buffers: total indexing heap bytes used [{}] vs {} [{}], currently writing bytes [{}], [{}] shards with non-zero indexing buffer", - new ByteSizeValue(totalBytesUsed), INDEX_BUFFER_SIZE_SETTING, indexingBuffer, new ByteSizeValue(totalBytesWriting), queue.size()); + new ByteSizeValue(totalBytesUsed), INDEX_BUFFER_SIZE_SETTING.getKey(), indexingBuffer, new ByteSizeValue(totalBytesWriting), queue.size()); while (totalBytesUsed > indexingBuffer.bytes() && queue.isEmpty() == false) { ShardAndBytesUsed largest = queue.poll();