Skip to content

Commit 8e96a82

Browse files
committed
Spotless formatting fixation
Signed-off-by: Harshita Kaushik <harycash@amazon.com>
1 parent a44f9ce commit 8e96a82

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

server/src/main/java/org/opensearch/common/settings/ClusterSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
import org.opensearch.http.HttpTransportSettings;
112112
import org.opensearch.index.IndexModule;
113113
import org.opensearch.index.IndexSettings;
114-
import org.opensearch.index.MergeSchedulerConfig;
115114
import org.opensearch.index.IndexingPressure;
115+
import org.opensearch.index.MergeSchedulerConfig;
116116
import org.opensearch.index.SegmentReplicationPressureService;
117117
import org.opensearch.index.ShardIndexingPressureMemoryManager;
118118
import org.opensearch.index.ShardIndexingPressureSettings;

server/src/main/java/org/opensearch/index/IndexSettings.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,10 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
11781178
mergeSchedulerConfig::setMaxThreadAndMergeCount
11791179
);
11801180
scopedSettings.addSettingsUpdateConsumer(MergeSchedulerConfig.AUTO_THROTTLE_SETTING, mergeSchedulerConfig::setAutoThrottle);
1181-
scopedSettings.addSettingsUpdateConsumer(MergeSchedulerConfig.MAX_FORCED_MERGE_MB_PER_SEC_SETTING, mergeSchedulerConfig::setMaxForcedMergeMBPerSec);
1181+
scopedSettings.addSettingsUpdateConsumer(
1182+
MergeSchedulerConfig.MAX_FORCED_MERGE_MB_PER_SEC_SETTING,
1183+
mergeSchedulerConfig::setMaxForcedMergeMBPerSec
1184+
);
11821185
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_DURABILITY_SETTING, this::setTranslogDurability);
11831186
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_SYNC_INTERVAL_SETTING, this::setTranslogSyncInterval);
11841187
scopedSettings.addSettingsUpdateConsumer(

server/src/main/java/org/opensearch/index/MergeSchedulerConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
* <p><b>Setting Precedence:</b>
8383
* <ul>
8484
* <li>If only index-level setting is specified: uses index value
85-
* <li>If only cluster-level setting is specified: uses cluster value
85+
* <li>If only cluster-level setting is specified: uses cluster value
8686
* <li>If both settings are specified: uses index value (index takes precedence)
8787
* <li>If neither setting is specified: uses default value (Double.POSITIVE_INFINITY)
8888
* </ul>
@@ -120,7 +120,7 @@ public final class MergeSchedulerConfig {
120120
Property.Dynamic,
121121
Property.IndexScope
122122
);
123-
123+
124124
public static final Setting<Double> CLUSTER_MAX_FORCED_MERGE_MB_PER_SEC_SETTING = Setting.doubleSetting(
125125
"cluster.merge.scheduler.max_forced_merge_mb_per_sec",
126126
Double.POSITIVE_INFINITY,
@@ -140,7 +140,7 @@ public final class MergeSchedulerConfig {
140140
int maxMerge = indexSettings.getValue(MAX_MERGE_COUNT_SETTING);
141141
setMaxThreadAndMergeCount(maxThread, maxMerge);
142142
this.autoThrottle = indexSettings.getValue(AUTO_THROTTLE_SETTING);
143-
143+
144144
// Index setting takes precedence over cluster setting
145145
if (MAX_FORCED_MERGE_MB_PER_SEC_SETTING.exists(indexSettings.getSettings())) {
146146
this.maxForcedMergeMBPerSec = indexSettings.getValue(MAX_FORCED_MERGE_MB_PER_SEC_SETTING);

server/src/main/java/org/opensearch/index/engine/OpenSearchConcurrentMergeScheduler.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void refreshConfig() {
224224
} else if (config.isAutoThrottle() == false && isEnabled) {
225225
disableAutoIOThrottle();
226226
}
227-
227+
228228
// Apply forced merge rate limiting
229229
applyMergeRateLimit();
230230
}
@@ -237,8 +237,13 @@ void refreshConfig() {
237237
private void applyMergeRateLimit() {
238238
double maxForcedMergeMBPerSec = config.getMaxForcedMergeMBPerSec();
239239
if (maxForcedMergeMBPerSec != super.getForceMergeMBPerSec()) {
240-
logger.info("[{}][{}] updating forced merge rate limit from [{}] to [{}] MB/sec",
241-
shardId.getIndexName(), shardId.id(), super.getForceMergeMBPerSec(), maxForcedMergeMBPerSec);
240+
logger.info(
241+
"[{}][{}] updating forced merge rate limit from [{}] to [{}] MB/sec",
242+
shardId.getIndexName(),
243+
shardId.id(),
244+
super.getForceMergeMBPerSec(),
245+
maxForcedMergeMBPerSec
246+
);
242247
super.setForceMergeMBPerSec(maxForcedMergeMBPerSec);
243248
}
244249
}

0 commit comments

Comments
 (0)