generated from amazon-archives/__template_Custom
-
Notifications
You must be signed in to change notification settings - Fork 186
Adjusting the merge policy setting to make merges less aggressive #3128
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
Open
shatejas
wants to merge
10
commits into
opensearch-project:main
Choose a base branch
from
shatejas:merge-policy-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+71
−1
Open
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c265441
Adjusting the merge policy setting to make merges less aggressive
shatejas 3527973
Adds changelog
shatejas 39da378
Adds integration test
shatejas 850ccba
Replacing setting names with Settings.getKey()
shatejas abb247f
Fixes the build
shatejas deddce1
Merge branch 'main' into merge-policy-fix
shatejas 1853bb0
Merge branch 'main' into merge-policy-fix
shatejas 3fdb5d1
Merge branch 'main' into merge-policy-fix
navneet1v ca24f9d
Merge branch 'main' into merge-policy-fix
shatejas 3008661
Merge branch 'main' into merge-policy-fix
navneet1v 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,8 @@ | |
| import org.opensearch.core.action.ActionResponse; | ||
| import org.opensearch.core.common.io.stream.NamedWriteableRegistry; | ||
| import org.opensearch.core.common.settings.SecureString; | ||
| import org.opensearch.core.common.unit.ByteSizeUnit; | ||
| import org.opensearch.core.common.unit.ByteSizeValue; | ||
| import org.opensearch.core.xcontent.NamedXContentRegistry; | ||
| import org.opensearch.env.Environment; | ||
| import org.opensearch.env.NodeEnvironment; | ||
|
|
@@ -284,7 +286,15 @@ public Collection<IndexSettingProvider> getAdditionalIndexSettingProviders() { | |
| @Override | ||
| public Settings getAdditionalIndexSettings(String indexName, boolean isDataStreamIndex, Settings templateAndRequestSettings) { | ||
| if (templateAndRequestSettings.getAsBoolean(KNNSettings.KNN_INDEX, false)) { | ||
| return Settings.builder().put(KNN_DERIVED_SOURCE_ENABLED, true).build(); | ||
| return Settings.builder() | ||
| .put(KNN_DERIVED_SOURCE_ENABLED, true) | ||
| // Aggressive merges for k-NN can hogg CPU which can degrade search performance | ||
| // These settings are being overridden to make it less aggressive | ||
| // Core has max_merge_at_once default as 30, which can make merges more aggressive | ||
| .put("index.merge.policy.max_merge_at_once", 10) | ||
|
||
| // Core has max_merge_at_once default as 16MB, which can make merges more aggressive | ||
| .put("index.merge.policy.floor_segment", new ByteSizeValue(2, ByteSizeUnit.MB)) | ||
shatejas marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .build(); | ||
| } | ||
| return Settings.EMPTY; | ||
| } | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should move this to enhancement section