-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Introducing MergedSegmentWarmerFactory to support the extension of IndexWriter.IndexReaderWarmer #17881
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.
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
Merged
ashking94
merged 11 commits into
opensearch-project:main
from
guojialiang92:dev/support_merged_segment_warmer
Apr 15, 2025
Merged
Introducing MergedSegmentWarmerFactory to support the extension of IndexWriter.IndexReaderWarmer #17881
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
4ab033c
support merged segment warmer
guojialiang92 e012362
Introduce MergedSegmentWarmerFactory for Local/Remote merged segment …
guojialiang92 281b4e3
add FeatureFlags.MERGED_SEGMENT_WARMER_EXPERIMENTAL_FLAG
guojialiang92 756ee73
Merge remote-tracking branch 'origin/main' into dev/support_merged_se…
guojialiang92 fc88036
add an entry in CHANGELOG
guojialiang92 a7e269b
Merge remote-tracking branch 'origin/main' into dev/support_merged_se…
guojialiang92 0fd7f2f
add validation
guojialiang92 ae894cb
modify changelog entry
guojialiang92 009fa6c
add comment
guojialiang92 a6157f0
add comment
guojialiang92 fa5481c
Merge remote-tracking branch 'origin/main' into dev/support_merged_se…
guojialiang92 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
server/src/main/java/org/opensearch/index/engine/LocalMergedSegmentWarmer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm very late to this pr, but we need to remove the es part of these licenses. |
||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
/* | ||
* Modifications Copyright OpenSearch Contributors. See | ||
* GitHub history for details. | ||
*/ | ||
|
||
package org.opensearch.index.engine; | ||
|
||
import org.apache.lucene.index.IndexWriter; | ||
import org.apache.lucene.index.LeafReader; | ||
import org.opensearch.cluster.service.ClusterService; | ||
import org.opensearch.indices.recovery.RecoverySettings; | ||
import org.opensearch.transport.TransportService; | ||
|
||
import java.io.IOException; | ||
|
||
/** | ||
* Implementation of a {@link IndexWriter.IndexReaderWarmer} when local on-disk segment replication is enabled. | ||
* | ||
* @opensearch.internal | ||
*/ | ||
public class LocalMergedSegmentWarmer implements IndexWriter.IndexReaderWarmer { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would have preferred this in a follow-up PR :) |
||
private final TransportService transportService; | ||
private final RecoverySettings recoverySettings; | ||
private final ClusterService clusterService; | ||
|
||
public LocalMergedSegmentWarmer(TransportService transportService, RecoverySettings recoverySettings, ClusterService clusterService) { | ||
this.transportService = transportService; | ||
this.recoverySettings = recoverySettings; | ||
this.clusterService = clusterService; | ||
} | ||
|
||
@Override | ||
public void warm(LeafReader leafReader) throws IOException { | ||
// TODO: node-node segment replication merged segment warmer | ||
} | ||
} |
69 changes: 69 additions & 0 deletions
69
server/src/main/java/org/opensearch/index/engine/MergedSegmentWarmerFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
/* | ||
* Modifications Copyright OpenSearch Contributors. See | ||
* GitHub history for details. | ||
*/ | ||
|
||
package org.opensearch.index.engine; | ||
|
||
import org.apache.lucene.index.IndexWriter; | ||
import org.opensearch.cluster.service.ClusterService; | ||
import org.opensearch.common.annotation.ExperimentalApi; | ||
import org.opensearch.index.shard.IndexShard; | ||
import org.opensearch.indices.recovery.RecoverySettings; | ||
import org.opensearch.transport.TransportService; | ||
|
||
/** | ||
* MergedSegmentWarmerFactory to enable creation of various local on-disk | ||
* and remote store flavors of {@link IndexWriter.IndexReaderWarmer} | ||
* | ||
* @opensearch.internal | ||
*/ | ||
@ExperimentalApi | ||
public class MergedSegmentWarmerFactory { | ||
private final TransportService transportService; | ||
private final RecoverySettings recoverySettings; | ||
private final ClusterService clusterService; | ||
|
||
public MergedSegmentWarmerFactory(TransportService transportService, RecoverySettings recoverySettings, ClusterService clusterService) { | ||
this.transportService = transportService; | ||
this.recoverySettings = recoverySettings; | ||
this.clusterService = clusterService; | ||
guojialiang92 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
public IndexWriter.IndexReaderWarmer get(IndexShard shard) { | ||
if (shard.indexSettings().isAssignedOnRemoteNode()) { | ||
return new RemoteStoreMergedSegmentWarmer(transportService, recoverySettings, clusterService); | ||
} else if (shard.indexSettings().isSegRepLocalEnabled()) { | ||
return new LocalMergedSegmentWarmer(transportService, recoverySettings, clusterService); | ||
} else { | ||
return null; | ||
guojialiang92 marked this conversation as resolved.
Show resolved
Hide resolved
guojialiang92 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.