honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic management of indexing buffer size, closes #241.

Browse Source
This commit is contained in:
kimchy 2010-06-30 01:46:57 +03:00
parent fdb2eff998
commit 088e0b5a64
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/elasticsearch/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryBufferController.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.indices.memory;
import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.service.IndexService;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
@ -38,6 +39,8 @@ public class IndexingMemoryBufferController extends AbstractComponent {
private final ByteSizeValue indexingBuffer; private final ByteSizeValue indexingBuffer;
private final ByteSizeValue minShardIndexBufferSize;
private final IndicesService indicesService; private final IndicesService indicesService;
private final Listener listener = new Listener(); private final Listener listener = new Listener();
@ -53,6 +56,9 @@ public class IndexingMemoryBufferController extends AbstractComponent {
} else { } else {
this.indexingBuffer = ByteSizeValue.parseBytesSizeValue(indexingBuffer, null); this.indexingBuffer = ByteSizeValue.parseBytesSizeValue(indexingBuffer, null);
} }
this.minShardIndexBufferSize = componentSettings.getAsBytesSize("min_shard_index_buffer_size", new ByteSizeValue(4, ByteSizeUnit.MB));
logger.debug("using index_buffer_size [{}], with min_shard_index_buffer_size [{}]", this.indexingBuffer, this.minShardIndexBufferSize);
indicesService.indicesLifecycle().addListener(listener); indicesService.indicesLifecycle().addListener(listener);
} }
@ -72,14 +78,17 @@ public class IndexingMemoryBufferController extends AbstractComponent {
if (shardsCount == 0) { if (shardsCount == 0) {
return; return;
} }
ByteSizeValue shardIndexingBuffer = calcShardIndexingBuffer(shardsCount); ByteSizeValue shardIndexingBufferSize = calcShardIndexingBuffer(shardsCount);
if (shardIndexingBuffer == null) { if (shardIndexingBufferSize == null) {
return; return;
} }
logger.debug("recalculating shard indexing buffer (reason={}), total is [{}] with [{}] shards, each shard set to [{}]", reason, indexingBuffer, shardsCount, shardIndexingBuffer); if (shardIndexingBufferSize.bytes() < minShardIndexBufferSize.bytes()) {
shardIndexingBufferSize = minShardIndexBufferSize;
}
logger.debug("recalculating shard indexing buffer (reason={}), total is [{}] with [{}] shards, each shard set to [{}]", reason, indexingBuffer, shardsCount, shardIndexingBufferSize);
for (IndexService indexService : indicesService) { for (IndexService indexService : indicesService) {
for (IndexShard indexShard : indexService) { for (IndexShard indexShard : indexService) {
((InternalIndexShard) indexShard).engine().indexingBuffer(shardIndexingBuffer); ((InternalIndexShard) indexShard).engine().indexingBuffer(shardIndexingBufferSize);
} }
} }
} }