Skip to content

Commit

Permalink
Core: fix SerialMergeScheduler to trigger index throttling
Browse files Browse the repository at this point in the history
SerialMergeScheduler (deprecated but still accepted, and randomly
picked by tests) was failing to cause index throttling when merges
were falling behind.  This could then cause "Delete Index failed - not
acked" timeouts when it took more than 30 seconds to close the index.

Closes elastic#8405
  • Loading branch information
mikemccand committed Nov 9, 2014
1 parent 7f55fcd commit 82baea2
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public SerialMergeSchedulerProvider(ShardId shardId, @IndexSettings Settings ind

@Override
public int getMaxMerges() {
return 2;
return 1;
}

@Override
Expand Down Expand Up @@ -90,7 +90,7 @@ public void close() {

}

/** NOTE: subclasses TrackingCONCURRENTMergeScheduler, but we set max_merge_count = max_thread_count = 1 above */
/** NOTE: subclasses TrackingCONCURRENTMergeScheduler, but we set max_merge_count = 2 and max_thread_count = 1, above */
public static class CustomSerialMergeScheduler extends TrackingConcurrentMergeScheduler {

private final ShardId shardId;
Expand Down

0 comments on commit 82baea2

Please sign in to comment.