Skip to content

Commit bffd7d2

Browse files
author
Harsh Kothari
committed
Code Spotless Fixes
Signed-off-by: Harsh Kothari <[email protected]>
1 parent c022224 commit bffd7d2

File tree

7 files changed

+194
-102
lines changed

7 files changed

+194
-102
lines changed

‎server/src/internalClusterTest/java/org/opensearch/autoforcemerge/AutoForceMergeManagerIT.java‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package org.opensearch.autoforcemerge;
1010

1111
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
12+
1213
import org.opensearch.cluster.metadata.IndexMetadata;
1314
import org.opensearch.common.settings.Settings;
1415
import org.opensearch.common.unit.TimeValue;
@@ -17,18 +18,18 @@
1718
import org.opensearch.core.common.unit.ByteSizeValue;
1819
import org.opensearch.index.IndexSettings;
1920
import org.opensearch.index.engine.SegmentsStats;
21+
import org.opensearch.index.shard.IndexShard;
2022
import org.opensearch.index.store.remote.file.CleanerDaemonThreadLeakFilter;
2123
import org.opensearch.node.Node;
2224
import org.opensearch.remotestore.RemoteStoreBaseIntegTestCase;
23-
import org.opensearch.test.OpenSearchIntegTestCase;
24-
import org.opensearch.index.shard.IndexShard;
2525
import org.opensearch.test.InternalTestCluster;
26+
import org.opensearch.test.OpenSearchIntegTestCase;
2627

2728
import java.util.concurrent.ExecutionException;
2829
import java.util.concurrent.atomic.AtomicLong;
2930

3031
import static org.opensearch.gateway.remote.RemoteClusterStateService.REMOTE_CLUSTER_STATE_ENABLED_SETTING;
31-
import static org.opensearch.test.hamcrest.OpenSearchAssertions.*;
32+
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
3233

3334
@ThreadLeakFilters(filters = CleanerDaemonThreadLeakFilter.class)
3435
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, supportsDedicatedMasters = false)
@@ -190,14 +191,30 @@ public void testAutoForceMergeTriggeringBasicWithFiveShardsOfTwoIndex() throws E
190191
internalTestCluster.startClusterManagerOnlyNode(clusterSettings);
191192
String dataNode = internalTestCluster.startDataOnlyNodes(1, clusterSettings).getFirst();
192193
internalCluster().startWarmOnlyNodes(1, clusterSettings).getFirst();
193-
assertAcked(client().admin().indices().prepareCreate(INDEX_NAME_1).setSettings(Settings.builder()
194-
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 3)
195-
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
196-
.build()).get());
197-
assertAcked(client().admin().indices().prepareCreate(INDEX_NAME_2).setSettings(Settings.builder()
198-
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2)
199-
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
200-
.build()).get());
194+
assertAcked(
195+
client().admin()
196+
.indices()
197+
.prepareCreate(INDEX_NAME_1)
198+
.setSettings(
199+
Settings.builder()
200+
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 3)
201+
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
202+
.build()
203+
)
204+
.get()
205+
);
206+
assertAcked(
207+
client().admin()
208+
.indices()
209+
.prepareCreate(INDEX_NAME_2)
210+
.setSettings(
211+
Settings.builder()
212+
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2)
213+
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
214+
.build()
215+
)
216+
.get()
217+
);
201218

202219
// Each ingestion request creates a segment here
203220
for (int i = 0; i < INGESTION_COUNT; i++) {
@@ -224,11 +241,10 @@ public void testAutoForceMergeTriggeringBasicWithFiveShardsOfTwoIndex() throws E
224241
SegmentsStats segmentsStatsForShard3Before = shard3.segmentStats(false, false);
225242
SegmentsStats segmentsStatsForShard4Before = shard4.segmentStats(false, false);
226243
SegmentsStats segmentsStatsForShard5Before = shard5.segmentStats(false, false);
227-
AtomicLong totalSegments = new AtomicLong(segmentsStatsForShard1Before.getCount()
228-
+ segmentsStatsForShard2Before.getCount()
229-
+ segmentsStatsForShard3Before.getCount()
230-
+ segmentsStatsForShard4Before.getCount()
231-
+ segmentsStatsForShard5Before.getCount());
244+
AtomicLong totalSegments = new AtomicLong(
245+
segmentsStatsForShard1Before.getCount() + segmentsStatsForShard2Before.getCount() + segmentsStatsForShard3Before.getCount()
246+
+ segmentsStatsForShard4Before.getCount() + segmentsStatsForShard5Before.getCount()
247+
);
232248

233249
assertTrue(totalSegments.get() > 5);
234250

@@ -240,11 +256,10 @@ public void testAutoForceMergeTriggeringBasicWithFiveShardsOfTwoIndex() throws E
240256
SegmentsStats segmentsStatsForShard3After = shard3.segmentStats(false, false);
241257
SegmentsStats segmentsStatsForShard4After = shard4.segmentStats(false, false);
242258
SegmentsStats segmentsStatsForShard5After = shard5.segmentStats(false, false);
243-
totalSegments.set(segmentsStatsForShard1After.getCount()
244-
+ segmentsStatsForShard2After.getCount()
245-
+ segmentsStatsForShard3After.getCount()
246-
+ segmentsStatsForShard4After.getCount()
247-
+ segmentsStatsForShard5After.getCount());
259+
totalSegments.set(
260+
segmentsStatsForShard1After.getCount() + segmentsStatsForShard2After.getCount() + segmentsStatsForShard3After.getCount()
261+
+ segmentsStatsForShard4After.getCount() + segmentsStatsForShard5After.getCount()
262+
);
248263
// refresh to clear old segments
249264
flushAndRefresh(INDEX_NAME_1);
250265
flushAndRefresh(INDEX_NAME_2);
@@ -256,4 +271,3 @@ public void testAutoForceMergeTriggeringBasicWithFiveShardsOfTwoIndex() throws E
256271
assertAcked(client().admin().indices().prepareDelete(INDEX_NAME_2).get());
257272
}
258273
}
259-

‎server/src/main/java/org/opensearch/autoforcemerge/AutoForceMergeManager.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,13 @@ public class AutoForceMergeManager extends AbstractLifecycleComponent {
6464

6565
private static final Logger logger = LogManager.getLogger(AutoForceMergeManager.class);
6666

67-
public AutoForceMergeManager(ThreadPool threadPool, OsService osService, JvmService jvmService,
68-
IndicesService indicesService, ClusterService clusterService) {
67+
public AutoForceMergeManager(
68+
ThreadPool threadPool,
69+
OsService osService,
70+
JvmService jvmService,
71+
IndicesService indicesService,
72+
ClusterService clusterService
73+
) {
6974
this.threadPool = threadPool;
7075
this.osService = osService;
7176
this.indicesService = indicesService;
@@ -118,8 +123,7 @@ private void triggerForceMerge() {
118123
iteration--;
119124
CompletableFuture.runAsync(() -> {
120125
try {
121-
shard.forceMerge(new ForceMergeRequest()
122-
.maxNumSegments(forceMergeManagerSettings.getSegmentCount()));
126+
shard.forceMerge(new ForceMergeRequest().maxNumSegments(forceMergeManagerSettings.getSegmentCount()));
123127
logger.debug("Merging is completed successfully for the shard {}", shard.shardId());
124128
} catch (IOException e) {
125129
logger.error("Error during force merge for shard {}", shard.shardId(), e);
@@ -219,11 +223,7 @@ private boolean isRemoteStorageEnabled() {
219223
private boolean hasWarmNodes() {
220224
if (hasWarmNodes == true) return true;
221225
ClusterState clusterState = clusterService.state();
222-
return hasWarmNodes = clusterState.getNodes().getNodes()
223-
.values()
224-
.stream()
225-
.anyMatch(DiscoveryNode::isWarmNode
226-
);
226+
return hasWarmNodes = clusterState.getNodes().getNodes().values().stream().anyMatch(DiscoveryNode::isWarmNode);
227227
}
228228
}
229229

@@ -263,7 +263,8 @@ private boolean areForceMergeThreadsAvailable() {
263263
}
264264

265265
public Integer getMaxConcurrentForceMerges() {
266-
return Math.max(1, (OpenSearchExecutors.allocatedProcessors(clusterService.getSettings()) / 8)) * forceMergeManagerSettings.getConcurrencyMultiplier();
266+
return Math.max(1, (OpenSearchExecutors.allocatedProcessors(clusterService.getSettings()) / 8)) * forceMergeManagerSettings
267+
.getConcurrencyMultiplier();
267268
}
268269
}
269270

@@ -302,8 +303,10 @@ public ValidationResult validate(IndexShard shard) {
302303
);
303304
return new ValidationResult(false);
304305
}
305-
if (translogStats != null && translogStats.getEarliestLastModifiedAge() < forceMergeManagerSettings.getSchedulerInterval().getMillis()) {
306-
logger.debug("Shard({}) skipped: Translog is too recent. Age({}ms)",
306+
if (translogStats != null
307+
&& translogStats.getEarliestLastModifiedAge() < forceMergeManagerSettings.getSchedulerInterval().getMillis()) {
308+
logger.debug(
309+
"Shard({}) skipped: Translog is too recent. Age({}ms)",
307310
shard.shardId(),
308311
translogStats.getEarliestLastModifiedAge()
309312
);
@@ -356,7 +359,6 @@ public boolean isAllowed() {
356359
*/
357360
protected final class AsyncForceMergeTask extends AbstractAsyncTask {
358361

359-
360362
/**
361363
* Constructs a new AsyncForceMergeTask and initializes its schedule.
362364
*/
@@ -412,4 +414,3 @@ protected ShardValidator getShardValidator() {
412414
return shardValidator;
413415
}
414416
}
415-

‎server/src/main/java/org/opensearch/autoforcemerge/ForceMergeManagerSettings.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import java.util.function.Consumer;
1818

19-
import static org.opensearch.index.translog.transfer.TranslogTransferMetadata.logger;
20-
2119
/**
2220
* Settings class that manages configuration parameters for the Auto Force Merge functionality.
2321
* This class handles settings related to force merge operations, including thresholds,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ public static boolean same(final Settings left, final Settings right) {
14881488
return left.filter(IndexScopedSettings.INDEX_SETTINGS_KEY_PREDICATE)
14891489
.equals(right.filter(IndexScopedSettings.INDEX_SETTINGS_KEY_PREDICATE))
14901490
&& left.filter(IndexScopedSettings.ARCHIVED_SETTINGS_KEY_PREDICATE)
1491-
.equals(right.filter(IndexScopedSettings.ARCHIVED_SETTINGS_KEY_PREDICATE));
1491+
.equals(right.filter(IndexScopedSettings.ARCHIVED_SETTINGS_KEY_PREDICATE));
14921492
}
14931493

14941494
/**

‎server/src/main/java/org/opensearch/node/Node.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,13 @@ protected Node(
11541154
workloadGroupService
11551155
);
11561156

1157-
this.autoForceMergeManager = new AutoForceMergeManager(threadPool, monitorService.osService(), monitorService.jvmService(), indicesService, clusterService);
1157+
this.autoForceMergeManager = new AutoForceMergeManager(
1158+
threadPool,
1159+
monitorService.osService(),
1160+
monitorService.jvmService(),
1161+
indicesService,
1162+
clusterService
1163+
);
11581164

11591165
final Collection<SecureSettingsFactory> secureSettingsFactories = pluginsService.filterPlugins(Plugin.class)
11601166
.stream()

0 commit comments

Comments
 (0)