2929import java .util .concurrent .TimeUnit ;
3030import java .util .concurrent .atomic .AtomicLong ;
3131
32+ import static org .opensearch .common .util .concurrent .OpenSearchExecutors .NODE_PROCESSORS_SETTING ;
3233import static org .opensearch .gateway .remote .RemoteClusterStateService .REMOTE_CLUSTER_STATE_ENABLED_SETTING ;
3334import static org .opensearch .test .hamcrest .OpenSearchAssertions .assertAcked ;
3435
@@ -57,7 +58,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
5758 .put (super .nodeSettings (nodeOrdinal ))
5859 .put (REMOTE_CLUSTER_STATE_ENABLED_SETTING .getKey (), true )
5960 .put (Node .NODE_SEARCH_CACHE_SIZE_SETTING .getKey (), cacheSize .toString ())
60- .put (OpenSearchExecutors . NODE_PROCESSORS_SETTING .getKey (), 32 )
61+ .put (NODE_PROCESSORS_SETTING .getKey (), 32 )
6162 .put (ForceMergeManagerSettings .AUTO_FORCE_MERGE_SCHEDULER_INTERVAL .getKey (), SCHEDULER_INTERVAL )
6263 .put (ForceMergeManagerSettings .TRANSLOG_AGE_AUTO_FORCE_MERGE .getKey (), TRANSLOG_AGE )
6364 .put (ForceMergeManagerSettings .SEGMENT_COUNT_FOR_AUTO_FORCE_MERGE .getKey (), SEGMENT_COUNT )
@@ -70,6 +71,7 @@ public void testAutoForceMergeFeatureFlagDisabled() throws InterruptedException,
7071 Settings clusterSettings = Settings .builder ()
7172 .put (super .nodeSettings (0 ))
7273 .put (ForceMergeManagerSettings .AUTO_FORCE_MERGE_SETTING .getKey (), false )
74+ .put (NODE_PROCESSORS_SETTING .getKey (), 8 )
7375 .build ();
7476 InternalTestCluster internalTestCluster = internalCluster ();
7577 internalTestCluster .startClusterManagerOnlyNode (clusterSettings );
@@ -111,9 +113,7 @@ public void testAutoForceMergeTriggeringWithOneShardOfNonWarmCandidate() throws
111113 Settings clusterSettings = Settings .builder ()
112114 .put (super .nodeSettings (0 ))
113115 .put (ForceMergeManagerSettings .AUTO_FORCE_MERGE_SETTING .getKey (), true )
114- .put (ForceMergeManagerSettings .DISK_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
115- .put (ForceMergeManagerSettings .JVM_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
116- .put (ForceMergeManagerSettings .CPU_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
116+ .put (NODE_PROCESSORS_SETTING .getKey (), 8 )
117117 .build ();
118118 InternalTestCluster internalTestCluster = internalCluster ();
119119 internalTestCluster .startClusterManagerOnlyNode (clusterSettings );
@@ -142,9 +142,7 @@ public void testAutoForceMergeTriggeringBasicWithOneShard() throws Exception {
142142 Settings clusterSettings = Settings .builder ()
143143 .put (super .nodeSettings (0 ))
144144 .put (ForceMergeManagerSettings .AUTO_FORCE_MERGE_SETTING .getKey (), true )
145- .put (ForceMergeManagerSettings .DISK_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
146- .put (ForceMergeManagerSettings .JVM_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
147- .put (ForceMergeManagerSettings .CPU_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
145+ .put (NODE_PROCESSORS_SETTING .getKey (), 8 )
148146 .build ();
149147 InternalTestCluster internalTestCluster = internalCluster ();
150148 internalTestCluster .startClusterManagerOnlyNode (clusterSettings );
@@ -174,9 +172,7 @@ public void testAutoForceMergeTriggeringBasicWithFiveShardsOfTwoIndex() throws E
174172 Settings clusterSettings = Settings .builder ()
175173 .put (super .nodeSettings (0 ))
176174 .put (ForceMergeManagerSettings .AUTO_FORCE_MERGE_SETTING .getKey (), true )
177- .put (ForceMergeManagerSettings .DISK_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
178- .put (ForceMergeManagerSettings .JVM_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
179- .put (ForceMergeManagerSettings .CPU_THRESHOLD_PERCENTAGE_FOR_AUTO_FORCE_MERGE .getKey (), 100 )
175+ .put (NODE_PROCESSORS_SETTING .getKey (), 8 )
180176 .build ();
181177 InternalTestCluster internalTestCluster = internalCluster ();
182178 internalTestCluster .startClusterManagerOnlyNode (clusterSettings );
0 commit comments