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

Core: don't block shard stats when phase 3 of recovery is running

Browse Source 
Today, shard stats are blocked while phase 3 of recovery (replay xlog)
is running; this change removes the engine readLock from shard stats
so it's not blocked.

Closes #8910
This commit is contained in:
Michael McCandless 2014-12-12 05:18:15 -05:00 committed by mikemccand
parent bb6e539bc7
commit c9d63d3482
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/elasticsearch/index/engine/internal/InternalEngine.java
View File

@ -332,7 +332,7 @@ public class InternalEngine implements Engine {
@Override @Override
public TimeValue defaultRefreshInterval() { public TimeValue defaultRefreshInterval() {
return InternalEngineHolder.DEFAULT_REFRESH_ITERVAL; return InternalEngineHolder.DEFAULT_REFRESH_INTERVAL;
} }
/** return the current indexing buffer size setting * */ /** return the current indexing buffer size setting * */
@ -1231,9 +1231,12 @@ public class InternalEngine implements Engine {
@Override @Override
public SegmentsStats segmentsStats() { public SegmentsStats segmentsStats() {
try (InternalLock _ = readLock.acquire()) {
ensureOpen(); // Does ensureOpen for us:
try (final Searcher searcher = acquireSearcher("segments_stats")) { final IndexWriter indexWriter = currentIndexWriter();
assert indexWriter != null;
try (final Searcher searcher = acquireSearcher("segments_stats")) {
SegmentsStats stats = new SegmentsStats(); SegmentsStats stats = new SegmentsStats();
for (LeafReaderContext reader : searcher.reader().leaves()) { for (LeafReaderContext reader : searcher.reader().leaves()) {
final SegmentReader segmentReader = segmentReader(reader.reader()); final SegmentReader segmentReader = segmentReader(reader.reader());
@ -1248,7 +1251,6 @@ public class InternalEngine implements Engine {
stats.addIndexWriterMemoryInBytes(indexWriter.ramBytesUsed()); stats.addIndexWriterMemoryInBytes(indexWriter.ramBytesUsed());
stats.addIndexWriterMaxMemoryInBytes((long) (indexWriter.getConfig().getRAMBufferSizeMB() * 1024 * 1024)); stats.addIndexWriterMaxMemoryInBytes((long) (indexWriter.getConfig().getRAMBufferSizeMB() * 1024 * 1024));
return stats; return stats;
}
} }
} }

4
src/main/java/org/elasticsearch/index/engine/internal/InternalEngineHolder.java
View File

@ -101,7 +101,7 @@ public class InternalEngineHolder extends AbstractIndexShardComponent implements
public static final String INDEX_FAIL_ON_MERGE_FAILURE = "index.fail_on_merge_failure"; public static final String INDEX_FAIL_ON_MERGE_FAILURE = "index.fail_on_merge_failure";
public static final String INDEX_FAIL_ON_CORRUPTION = "index.fail_on_corruption"; public static final String INDEX_FAIL_ON_CORRUPTION = "index.fail_on_corruption";
public static final TimeValue DEFAULT_REFRESH_ITERVAL = new TimeValue(1, TimeUnit.SECONDS); public static final TimeValue DEFAULT_REFRESH_INTERVAL = new TimeValue(1, TimeUnit.SECONDS);
private final CopyOnWriteArrayList<FailedEngineListener> failedEngineListeners = new CopyOnWriteArrayList<>(); private final CopyOnWriteArrayList<FailedEngineListener> failedEngineListeners = new CopyOnWriteArrayList<>();
@ -150,7 +150,7 @@ public class InternalEngineHolder extends AbstractIndexShardComponent implements
@Override @Override
public TimeValue defaultRefreshInterval() { public TimeValue defaultRefreshInterval() {
return DEFAULT_REFRESH_ITERVAL; return DEFAULT_REFRESH_INTERVAL;
} }