From 5c525e660693b2201c59c873fcc7ba2ca965dac5 Mon Sep 17 00:00:00 2001 From: Mike McCandless Date: Tue, 31 May 2016 06:29:29 -0400 Subject: [PATCH] Remove index_writer_max_memory stat from segment stats --- .../elasticsearch/index/engine/Engine.java | 1 - .../index/engine/InternalEngine.java | 1 - .../index/engine/SegmentsStats.java | 22 ------------------- .../rest/action/cat/RestIndicesAction.java | 6 ----- .../rest/action/cat/RestNodesAction.java | 2 -- .../rest/action/cat/RestShardsAction.java | 2 -- .../indices/stats/IndexStatsIT.java | 1 - docs/reference/cat/nodes.asciidoc | 2 -- docs/reference/cluster/stats.asciidoc | 2 -- .../test/cat.shards/10_basic.yaml | 1 - 10 files changed, 40 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/core/src/main/java/org/elasticsearch/index/engine/Engine.java index 76f9a5f8a81..ab142f9dd51 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -503,7 +503,6 @@ public abstract class Engine implements Closeable { // by default we don't have a writer here... subclasses can override this stats.addVersionMapMemoryInBytes(0); stats.addIndexWriterMemoryInBytes(0); - stats.addIndexWriterMaxMemoryInBytes(0); } /** How much heap is used that would be freed by a refresh. Note that this may throw {@link AlreadyClosedException}. */ diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index cf96fb06358..c120b07fce8 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -851,7 +851,6 @@ public class InternalEngine extends Engine { protected final void writerSegmentStats(SegmentsStats stats) { stats.addVersionMapMemoryInBytes(versionMap.ramBytesUsed()); stats.addIndexWriterMemoryInBytes(indexWriter.ramBytesUsed()); - stats.addIndexWriterMaxMemoryInBytes((long) (indexWriter.getConfig().getRAMBufferSizeMB() * 1024 * 1024)); } @Override diff --git a/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java b/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java index dcd97dfef0e..8f0388aef05 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java +++ b/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java @@ -43,7 +43,6 @@ public class SegmentsStats implements Streamable, ToXContent { private long pointsMemoryInBytes; private long docValuesMemoryInBytes; private long indexWriterMemoryInBytes; - private long indexWriterMaxMemoryInBytes; private long versionMapMemoryInBytes; private long bitsetMemoryInBytes; private ImmutableOpenMap fileSizes = ImmutableOpenMap.of(); @@ -111,10 +110,6 @@ public class SegmentsStats implements Streamable, ToXContent { this.indexWriterMemoryInBytes += indexWriterMemoryInBytes; } - public void addIndexWriterMaxMemoryInBytes(long indexWriterMaxMemoryInBytes) { - this.indexWriterMaxMemoryInBytes += indexWriterMaxMemoryInBytes; - } - public void addVersionMapMemoryInBytes(long versionMapMemoryInBytes) { this.versionMapMemoryInBytes += versionMapMemoryInBytes; } @@ -151,7 +146,6 @@ public class SegmentsStats implements Streamable, ToXContent { addPointsMemoryInBytes(mergeStats.pointsMemoryInBytes); addDocValuesMemoryInBytes(mergeStats.docValuesMemoryInBytes); addIndexWriterMemoryInBytes(mergeStats.indexWriterMemoryInBytes); - addIndexWriterMaxMemoryInBytes(mergeStats.indexWriterMaxMemoryInBytes); addVersionMapMemoryInBytes(mergeStats.versionMapMemoryInBytes); addBitsetMemoryInBytes(mergeStats.bitsetMemoryInBytes); addFileSizes(mergeStats.fileSizes); @@ -252,17 +246,6 @@ public class SegmentsStats implements Streamable, ToXContent { return new ByteSizeValue(indexWriterMemoryInBytes); } - /** - * Maximum memory index writer may use before it must write buffered documents to a new segment. - */ - public long getIndexWriterMaxMemoryInBytes() { - return this.indexWriterMaxMemoryInBytes; - } - - public ByteSizeValue getIndexWriterMaxMemory() { - return new ByteSizeValue(indexWriterMaxMemoryInBytes); - } - /** * Estimation of the memory usage by version map */ @@ -307,7 +290,6 @@ public class SegmentsStats implements Streamable, ToXContent { builder.byteSizeField(Fields.POINTS_MEMORY_IN_BYTES, Fields.POINTS_MEMORY, pointsMemoryInBytes); builder.byteSizeField(Fields.DOC_VALUES_MEMORY_IN_BYTES, Fields.DOC_VALUES_MEMORY, docValuesMemoryInBytes); builder.byteSizeField(Fields.INDEX_WRITER_MEMORY_IN_BYTES, Fields.INDEX_WRITER_MEMORY, indexWriterMemoryInBytes); - builder.byteSizeField(Fields.INDEX_WRITER_MAX_MEMORY_IN_BYTES, Fields.INDEX_WRITER_MAX_MEMORY, indexWriterMaxMemoryInBytes); builder.byteSizeField(Fields.VERSION_MAP_MEMORY_IN_BYTES, Fields.VERSION_MAP_MEMORY, versionMapMemoryInBytes); builder.byteSizeField(Fields.FIXED_BIT_SET_MEMORY_IN_BYTES, Fields.FIXED_BIT_SET, bitsetMemoryInBytes); builder.startObject(Fields.FILE_SIZES); @@ -342,8 +324,6 @@ public class SegmentsStats implements Streamable, ToXContent { static final String DOC_VALUES_MEMORY_IN_BYTES = "doc_values_memory_in_bytes"; static final String INDEX_WRITER_MEMORY = "index_writer_memory"; static final String INDEX_WRITER_MEMORY_IN_BYTES = "index_writer_memory_in_bytes"; - static final String INDEX_WRITER_MAX_MEMORY = "index_writer_max_memory"; - static final String INDEX_WRITER_MAX_MEMORY_IN_BYTES = "index_writer_max_memory_in_bytes"; static final String VERSION_MAP_MEMORY = "version_map_memory"; static final String VERSION_MAP_MEMORY_IN_BYTES = "version_map_memory_in_bytes"; static final String FIXED_BIT_SET = "fixed_bit_set"; @@ -366,7 +346,6 @@ public class SegmentsStats implements Streamable, ToXContent { docValuesMemoryInBytes = in.readLong(); indexWriterMemoryInBytes = in.readLong(); versionMapMemoryInBytes = in.readLong(); - indexWriterMaxMemoryInBytes = in.readLong(); bitsetMemoryInBytes = in.readLong(); int size = in.readVInt(); @@ -391,7 +370,6 @@ public class SegmentsStats implements Streamable, ToXContent { out.writeLong(docValuesMemoryInBytes); out.writeLong(indexWriterMemoryInBytes); out.writeLong(versionMapMemoryInBytes); - out.writeLong(indexWriterMaxMemoryInBytes); out.writeLong(bitsetMemoryInBytes); out.writeVInt(fileSizes.size()); diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java index ac8cefcc5aa..eaf9ad4a081 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java @@ -281,9 +281,6 @@ public class RestIndicesAction extends AbstractCatAction { table.addCell("segments.index_writer_memory", "sibling:pri;alias:siwm,segmentsIndexWriterMemory;default:false;text-align:right;desc:memory used by index writer"); table.addCell("pri.segments.index_writer_memory", "default:false;text-align:right;desc:memory used by index writer"); - table.addCell("segments.index_writer_max_memory", "sibling:pri;alias:siwmx,segmentsIndexWriterMaxMemory;default:false;text-align:right;desc:maximum memory index writer may use before it must write buffered documents to a new segment"); - table.addCell("pri.segments.index_writer_max_memory", "default:false;text-align:right;desc:maximum memory index writer may use before it must write buffered documents to a new segment"); - table.addCell("segments.version_map_memory", "sibling:pri;alias:svmm,segmentsVersionMapMemory;default:false;text-align:right;desc:memory used by version map"); table.addCell("pri.segments.version_map_memory", "default:false;text-align:right;desc:memory used by version map"); @@ -480,9 +477,6 @@ public class RestIndicesAction extends AbstractCatAction { table.addCell(indexStats == null ? null : indexStats.getTotal().getSegments().getIndexWriterMemory()); table.addCell(indexStats == null ? null : indexStats.getPrimaries().getSegments().getIndexWriterMemory()); - table.addCell(indexStats == null ? null : indexStats.getTotal().getSegments().getIndexWriterMaxMemory()); - table.addCell(indexStats == null ? null : indexStats.getPrimaries().getSegments().getIndexWriterMaxMemory()); - table.addCell(indexStats == null ? null : indexStats.getTotal().getSegments().getVersionMapMemory()); table.addCell(indexStats == null ? null : indexStats.getPrimaries().getSegments().getVersionMapMemory()); diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java index f23f0e0a029..1069a879d94 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java @@ -204,7 +204,6 @@ public class RestNodesAction extends AbstractCatAction { table.addCell("segments.count", "alias:sc,segmentsCount;default:false;text-align:right;desc:number of segments"); table.addCell("segments.memory", "alias:sm,segmentsMemory;default:false;text-align:right;desc:memory used by segments"); table.addCell("segments.index_writer_memory", "alias:siwm,segmentsIndexWriterMemory;default:false;text-align:right;desc:memory used by index writer"); - table.addCell("segments.index_writer_max_memory", "alias:siwmx,segmentsIndexWriterMaxMemory;default:false;text-align:right;desc:maximum memory index writer may use before it must write buffered documents to a new segment"); table.addCell("segments.version_map_memory", "alias:svmm,segmentsVersionMapMemory;default:false;text-align:right;desc:memory used by version map"); table.addCell("segments.fixed_bitset_memory", "alias:sfbm,fixedBitsetMemory;default:false;text-align:right;desc:memory used by fixed bit sets for nested object field types and type filters for types referred in _parent fields"); @@ -359,7 +358,6 @@ public class RestNodesAction extends AbstractCatAction { table.addCell(segmentsStats == null ? null : segmentsStats.getCount()); table.addCell(segmentsStats == null ? null : segmentsStats.getMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getIndexWriterMemory()); - table.addCell(segmentsStats == null ? null : segmentsStats.getIndexWriterMaxMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getVersionMapMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getBitsetMemory()); diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java index 6538b405fce..0f6bec367d5 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java @@ -156,7 +156,6 @@ public class RestShardsAction extends AbstractCatAction { table.addCell("segments.count", "alias:sc,segmentsCount;default:false;text-align:right;desc:number of segments"); table.addCell("segments.memory", "alias:sm,segmentsMemory;default:false;text-align:right;desc:memory used by segments"); table.addCell("segments.index_writer_memory", "alias:siwm,segmentsIndexWriterMemory;default:false;text-align:right;desc:memory used by index writer"); - table.addCell("segments.index_writer_max_memory", "alias:siwmx,segmentsIndexWriterMaxMemory;default:false;text-align:right;desc:maximum memory index writer may use before it must write buffered documents to a new segment"); table.addCell("segments.version_map_memory", "alias:svmm,segmentsVersionMapMemory;default:false;text-align:right;desc:memory used by version map"); table.addCell("segments.fixed_bitset_memory", "alias:sfbm,fixedBitsetMemory;default:false;text-align:right;desc:memory used by fixed bit sets for nested object field types and type filters for types referred in _parent fields"); @@ -293,7 +292,6 @@ public class RestShardsAction extends AbstractCatAction { table.addCell(commonStats == null ? null : commonStats.getSegments().getCount()); table.addCell(commonStats == null ? null : commonStats.getSegments().getMemory()); table.addCell(commonStats == null ? null : commonStats.getSegments().getIndexWriterMemory()); - table.addCell(commonStats == null ? null : commonStats.getSegments().getIndexWriterMaxMemory()); table.addCell(commonStats == null ? null : commonStats.getSegments().getVersionMapMemory()); table.addCell(commonStats == null ? null : commonStats.getSegments().getBitsetMemory()); diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java index 66aed327f70..3565cf0147d 100644 --- a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java @@ -544,7 +544,6 @@ public class IndexStatsIT extends ESIntegTestCase { IndicesStatsResponse stats = client().admin().indices().prepareStats().setSegments(true).get(); assertThat(stats.getTotal().getSegments().getIndexWriterMemoryInBytes(), greaterThan(0L)); - assertThat(stats.getTotal().getSegments().getIndexWriterMaxMemoryInBytes(), greaterThan(0L)); assertThat(stats.getTotal().getSegments().getVersionMapMemoryInBytes(), greaterThan(0L)); client().admin().indices().prepareFlush().get(); diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc index bd0bc9d5ba2..288a28f3642 100644 --- a/docs/reference/cat/nodes.asciidoc +++ b/docs/reference/cat/nodes.asciidoc @@ -201,8 +201,6 @@ operations |9 segments |1.4kb |`segments.index_writer_memory` |`siwm`, `segmentsIndexWriterMemory` |No |Memory used by index writer |18mb -|`segments.index_writer_max_memory` |`siwmx`, `segmentsIndexWriterMaxMemory` |No -|Maximum memory index writer may use before it must write buffered documents to a new segment |32mb |`segments.version_map_memory` |`svmm`, `segmentsVersionMapMemory` |No |Memory used by version map |1.0kb |======================================================================= diff --git a/docs/reference/cluster/stats.asciidoc b/docs/reference/cluster/stats.asciidoc index 7365aa1af70..4758ea2b0c4 100644 --- a/docs/reference/cluster/stats.asciidoc +++ b/docs/reference/cluster/stats.asciidoc @@ -87,8 +87,6 @@ Will return, for example: "doc_values_memory_in_bytes": 744, "index_writer_memory": "0b", "index_writer_memory_in_bytes": 0, - "index_writer_max_memory": "2.5gb", - "index_writer_max_memory_in_bytes": 2684354560, "version_map_memory": "0b", "version_map_memory_in_bytes": 0, "fixed_bit_set": "0b", diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml index 97ffae1f802..28da3be4511 100755 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml @@ -63,7 +63,6 @@ segments.count .+ \n segments.memory .+ \n segments.index_writer_memory .+ \n - segments.index_writer_max_memory .+ \n segments.version_map_memory .+ \n segments.fixed_bitset_memory .+ \n warmer.current .+ \n