Skip to content

Commit

Permalink
Renaming log byte size policy setting with mb
Browse files Browse the repository at this point in the history 
Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
  • Loading branch information
@rishabhmaurya
rishabhmaurya committed Oct 2, 2023
1 parent 32ab21a commit aa7e5fb
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 33 deletions.
6 changes: 3 additions & 3 deletions server/src/main/java/org/opensearch/common/settings/IndexScopedSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
IndexSettings.INDEX_MERGE_ON_FLUSH_POLICY,
IndexSettings.INDEX_MERGE_POLICY,
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MERGE_FACTOR_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_MB_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_FOR_FORCED_MERGE_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_FOR_FORCED_MERGE_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGED_DOCS_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_NO_CFS_RATIO_SETTING,
IndexSettings.DEFAULT_SEARCH_PIPELINE,
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/org/opensearch/index/IndexSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,15 +963,15 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
logByteSizeMergePolicyProvider::setLBSMergeFactor
);
scopedSettings.addSettingsUpdateConsumer(
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_MB_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_SETTING,
logByteSizeMergePolicyProvider::setLBSMinMergedMB
);
scopedSettings.addSettingsUpdateConsumer(
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_SETTING,
logByteSizeMergePolicyProvider::setLBSMaxMergeSegment
);
scopedSettings.addSettingsUpdateConsumer(
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_FOR_FORCED_MERGE_SETTING,
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_FOR_FORCED_MERGE_SETTING,
logByteSizeMergePolicyProvider::setLBSMaxMergeMBForForcedMerge
);
scopedSettings.addSettingsUpdateConsumer(
Expand Down
37 changes: 17 additions & 20 deletions server/src/main/java/org/opensearch/index/LogByteSizeMergePolicyProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ public class LogByteSizeMergePolicyProvider implements MergePolicyProvider {
private final Logger logger;
private final boolean mergesEnabled;

public static final ByteSizeValue DEFAULT_MIN_MERGE_MB = new ByteSizeValue(2, ByteSizeUnit.MB);
public static final ByteSizeValue DEFAULT_MIN_MERGE = new ByteSizeValue(2, ByteSizeUnit.MB);
public static final int DEFAULT_MERGE_FACTOR = 10;

public static final ByteSizeValue DEFAULT_MAX_MERGED_SEGMENT = new ByteSizeValue(5, ByteSizeUnit.GB);

public static final ByteSizeValue DEFAULT_MAX_MERGE_SEGMENT_MB_FORCE_MERGE = new ByteSizeValue(
Long.MAX_VALUE / ByteSizeUnit.GB.toBytes(1),
ByteSizeUnit.GB
);
public static final ByteSizeValue DEFAULT_MAX_MERGE_SEGMENT_FORCE_MERGE = new ByteSizeValue(Long.MAX_VALUE);

public static final Setting<Integer> INDEX_LBS_MERGE_POLICY_MERGE_FACTOR_SETTING = Setting.intSetting(
"index.merge.log_byte_size_policy.merge_factor",
Expand All @@ -68,23 +65,23 @@ public class LogByteSizeMergePolicyProvider implements MergePolicyProvider {
Setting.Property.IndexScope
);

public static final Setting<ByteSizeValue> INDEX_LBS_MERGE_POLICY_MIN_MERGE_MB_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.min_merge_mb",
DEFAULT_MIN_MERGE_MB, // keeping it same as default floor segment for tiered merge policy
public static final Setting<ByteSizeValue> INDEX_LBS_MERGE_POLICY_MIN_MERGE_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.min_merge",
DEFAULT_MIN_MERGE, // keeping it same as default floor segment for tiered merge policy
Setting.Property.Dynamic,
Setting.Property.IndexScope
);

public static final Setting<ByteSizeValue> INDEX_LBS_MAX_MERGE_SEGMENT_MB_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.max_merge_segment_mb",
public static final Setting<ByteSizeValue> INDEX_LBS_MAX_MERGE_SEGMENT_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.max_merge_segment",
DEFAULT_MAX_MERGED_SEGMENT, // keeping default same as tiered merge policy
Setting.Property.Dynamic,
Setting.Property.IndexScope
);

public static final Setting<ByteSizeValue> INDEX_LBS_MAX_MERGE_SEGMENT_MB_FOR_FORCED_MERGE_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.max_merge_segment_mb_forced_merge",
DEFAULT_MAX_MERGE_SEGMENT_MB_FORCE_MERGE,
public static final Setting<ByteSizeValue> INDEX_LBS_MAX_MERGE_SEGMENT_FOR_FORCED_MERGE_SETTING = Setting.byteSizeSetting(
"index.merge.log_byte_size_policy.max_merge_segment_forced_merge",
DEFAULT_MAX_MERGE_SEGMENT_FORCE_MERGE,
Setting.Property.Dynamic,
Setting.Property.IndexScope
);
Expand All @@ -110,10 +107,10 @@ public class LogByteSizeMergePolicyProvider implements MergePolicyProvider {

// Undocumented settings, works great with defaults
logByteSizeMergePolicy.setMergeFactor(indexSettings.getValue(INDEX_LBS_MERGE_POLICY_MERGE_FACTOR_SETTING));
logByteSizeMergePolicy.setMinMergeMB(indexSettings.getValue(INDEX_LBS_MERGE_POLICY_MIN_MERGE_MB_SETTING).getMbFrac());
logByteSizeMergePolicy.setMaxMergeMB(indexSettings.getValue(INDEX_LBS_MAX_MERGE_SEGMENT_MB_SETTING).getMbFrac());
logByteSizeMergePolicy.setMinMergeMB(indexSettings.getValue(INDEX_LBS_MERGE_POLICY_MIN_MERGE_SETTING).getMbFrac());
logByteSizeMergePolicy.setMaxMergeMB(indexSettings.getValue(INDEX_LBS_MAX_MERGE_SEGMENT_SETTING).getMbFrac());
logByteSizeMergePolicy.setMaxMergeMBForForcedMerge(
indexSettings.getValue(INDEX_LBS_MAX_MERGE_SEGMENT_MB_FOR_FORCED_MERGE_SETTING).getMbFrac()
indexSettings.getValue(INDEX_LBS_MAX_MERGE_SEGMENT_FOR_FORCED_MERGE_SETTING).getMbFrac()
);
logByteSizeMergePolicy.setMaxMergeDocs(indexSettings.getValue(INDEX_LBS_MAX_MERGED_DOCS_SETTING));
logByteSizeMergePolicy.setNoCFSRatio(indexSettings.getValue(INDEX_LBS_NO_CFS_RATIO_SETTING));
Expand All @@ -132,12 +129,12 @@ void setLBSMaxMergeSegment(ByteSizeValue maxMergeSegment) {
logByteSizeMergePolicy.setMaxMergeMB(maxMergeSegment.getMbFrac());
}

void setLBSMinMergedMB(ByteSizeValue minMergedMB) {
logByteSizeMergePolicy.setMinMergeMB(minMergedMB.getMbFrac());
void setLBSMinMergedMB(ByteSizeValue minMergedSize) {
logByteSizeMergePolicy.setMinMergeMB(minMergedSize.getMbFrac());
}

void setLBSMaxMergeMBForForcedMerge(ByteSizeValue maxMergeMBForcedMerge) {
logByteSizeMergePolicy.setMaxMergeMBForForcedMerge(maxMergeMBForcedMerge.getMbFrac());
void setLBSMaxMergeMBForForcedMerge(ByteSizeValue maxMergeForcedMerge) {
logByteSizeMergePolicy.setMaxMergeMBForForcedMerge(maxMergeForcedMerge.getMbFrac());
}

void setLBSMaxMergeDocs(int maxMergeDocs) {
Expand Down
14 changes: 7 additions & 7 deletions server/src/test/java/org/opensearch/index/MergePolicySettingsTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,16 +462,16 @@ public void testLogByteSizeMergePolicySettingsUpdate() throws IOException {
Settings.builder()
.put(IndexSettings.INDEX_MERGE_POLICY.getKey(), "log_byte_size")
.put(
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_MB_SETTING.getKey(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MIN_MERGE_MB.getMb() + 1, ByteSizeUnit.MB)
LogByteSizeMergePolicyProvider.INDEX_LBS_MERGE_POLICY_MIN_MERGE_SETTING.getKey(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MIN_MERGE.getMb() + 1, ByteSizeUnit.MB)
)
.build()
)
);

assertEquals(
((LogByteSizeMergePolicy) indexSettings.getMergePolicy(true)).getMinMergeMB(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MIN_MERGE_MB.getMb() + 1, ByteSizeUnit.MB).getMbFrac(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MIN_MERGE.getMb() + 1, ByteSizeUnit.MB).getMbFrac(),
0.001
);

Expand All @@ -481,7 +481,7 @@ public void testLogByteSizeMergePolicySettingsUpdate() throws IOException {
Settings.builder()
.put(IndexSettings.INDEX_MERGE_POLICY.getKey(), "log_byte_size")
.put(
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_SETTING.getKey(),
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_SETTING.getKey(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MAX_MERGED_SEGMENT.getMb() + 100, ByteSizeUnit.MB)
)
.build()
Expand All @@ -500,9 +500,9 @@ public void testLogByteSizeMergePolicySettingsUpdate() throws IOException {
Settings.builder()
.put(IndexSettings.INDEX_MERGE_POLICY.getKey(), "log_byte_size")
.put(
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_MB_FOR_FORCED_MERGE_SETTING.getKey(),
LogByteSizeMergePolicyProvider.INDEX_LBS_MAX_MERGE_SEGMENT_FOR_FORCED_MERGE_SETTING.getKey(),
new ByteSizeValue(
LogByteSizeMergePolicyProvider.DEFAULT_MAX_MERGE_SEGMENT_MB_FORCE_MERGE.getMb() + 1,
LogByteSizeMergePolicyProvider.DEFAULT_MAX_MERGE_SEGMENT_FORCE_MERGE.getMb() - 100,
ByteSizeUnit.MB
)
)
Expand All @@ -511,7 +511,7 @@ public void testLogByteSizeMergePolicySettingsUpdate() throws IOException {
);
assertEquals(
((LogByteSizeMergePolicy) indexSettings.getMergePolicy(true)).getMaxMergeMBForForcedMerge(),
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MAX_MERGE_SEGMENT_MB_FORCE_MERGE.getMb() + 1, ByteSizeUnit.MB)
new ByteSizeValue(LogByteSizeMergePolicyProvider.DEFAULT_MAX_MERGE_SEGMENT_FORCE_MERGE.getMb() - 100, ByteSizeUnit.MB)
.getMbFrac(),
0.001
);
Expand Down

0 comments on commit aa7e5fb

Please sign in to comment.