honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove nocommits; fix test case

This commit is contained in:
Michael McCandless 2016-01-06 03:41:23 -05:00 committed by mikemccand
parent 1d46a00d43
commit 5f4afe842c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -555,7 +555,6 @@ public class IndexShard extends AbstractIndexShardComponent {
refreshMetric.inc(System.nanoTime() - time); refreshMetric.inc(System.nanoTime() - time);
} finally { } finally {
logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId()); logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId());
// nocommit but we don't promptly stop index throttling anymore?
writingBytes.addAndGet(-bytes); writingBytes.addAndGet(-bytes);
} }
} else { } else {
@ -1280,7 +1279,6 @@ public class IndexShard extends AbstractIndexShardComponent {
try { try {
engine.writeIndexingBuffer(); engine.writeIndexingBuffer();
} finally { } finally {
// nocommit but we don't promptly stop index throttling anymore?
writingBytes.addAndGet(-bytes); writingBytes.addAndGet(-bytes);
logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId()); logger.debug("remove [{}] writing bytes for shard [{}]", new ByteSizeValue(bytes), shardId());
} }

7
core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
View File

@ -330,7 +330,14 @@ public class IndexingMemoryControllerTests extends ESSingleNodeTestCase {
@Override @Override
protected long getIndexBufferRAMBytesUsed(IndexShard shard) { protected long getIndexBufferRAMBytesUsed(IndexShard shard) {
return shard.getIndexBufferRAMBytesUsed(); return shard.getIndexBufferRAMBytesUsed();
}
@Override
protected void writeIndexingBufferAsync(IndexShard shard) {
// just do it sync'd for this test
shard.writeIndexingBuffer();
} }
}; };
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {