diff --git a/pom.xml b/pom.xml index 8f3de4c046358..59309b05719aa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 5.1.0 - 5.1.0-snapshot-1652032 + 5.1.0-snapshot-1654549 auto true onerror @@ -54,7 +54,7 @@ Lucene snapshots - https://download.elasticsearch.org/lucenesnapshots/1652032 + https://download.elasticsearch.org/lucenesnapshots/1654549 diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java index 5605603ce9746..f52827d08661a 100644 --- a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java @@ -162,8 +162,9 @@ protected void afterMerge(OnGoingMerge merge) { } @Override - protected void maybeStall(IndexWriter writer) { + protected boolean maybeStall(IndexWriter writer) { // Don't stall here, because we do our own index throttling (in InternalEngine.IndexThrottle) when merges can't keep up + return true; } }