Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rename] ElasticsearchConcurrentMergeScheduler class in server module #179

Merged
merged 1 commit into from
Mar 4, 2021
Merged

[Rename] ElasticsearchConcurrentMergeScheduler class in server module #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Rename] ElasticsearchConcurrentMergeScheduler class in server module 
This commit refactors ElasticsearchConcurrentMergeScheduler class in the server
module to OpenSearchConcurrentMergeScheduler. References and usages throughout
the rest of the codebase are fully refactored.

Signed-off-by: Nicholas Knize <nknize@amazon.com>
  • Loading branch information
@nknize
nknize committed Mar 3, 2021
commit 2d8d706fe67dd5cda1396e8148e82242a0dd420a
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public class InternalEngine extends Engine {
private volatile long lastDeleteVersionPruneTimeMSec;

private final Translog translog;
private final ElasticsearchConcurrentMergeScheduler mergeScheduler;
private final OpenSearchConcurrentMergeScheduler mergeScheduler;

private final IndexWriter indexWriter;

Expand Down Expand Up @@ -2396,7 +2396,7 @@ LiveIndexWriterConfig getCurrentIndexWriterConfig() {
return indexWriter.getConfig();
}

private final class EngineMergeScheduler extends ElasticsearchConcurrentMergeScheduler {
private final class EngineMergeScheduler extends OpenSearchConcurrentMergeScheduler {
private final AtomicInteger numMergesInFlight = new AtomicInteger(0);
private final AtomicBoolean isThrottling = new AtomicBoolean();

Expand Down
4 changes: 2 additions & 2 deletions ...lasticsearchConcurrentMergeScheduler.java → ...e/OpenSearchConcurrentMergeScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* An extension to the {@link ConcurrentMergeScheduler} that provides tracking on merge times, total
* and current merges.
*/
class ElasticsearchConcurrentMergeScheduler extends ConcurrentMergeScheduler {
class OpenSearchConcurrentMergeScheduler extends ConcurrentMergeScheduler {

protected final Logger logger;
private final Settings indexSettings;
Expand All @@ -66,7 +66,7 @@ class ElasticsearchConcurrentMergeScheduler extends ConcurrentMergeScheduler {
private final Set<OnGoingMerge> readOnlyOnGoingMerges = Collections.unmodifiableSet(onGoingMerges);
private final MergeSchedulerConfig config;

ElasticsearchConcurrentMergeScheduler(ShardId shardId, IndexSettings indexSettings) {
OpenSearchConcurrentMergeScheduler(ShardId shardId, IndexSettings indexSettings) {
this.config = indexSettings.getMergeSchedulerConfig();
this.shardId = shardId;
this.indexSettings = indexSettings.getSettings();
Expand Down