Skip to content

Commit a68d57b

Browse files
author
Aditya Khera
committed
Fixing tests
Signed-off-by: Aditya Khera <kheraadi@amazon.com>
1 parent a142adb commit a68d57b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

server/src/test/java/org/opensearch/index/engine/MergeRateLimitingTests.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.opensearch.common.settings.Settings;
2020
import org.opensearch.core.index.shard.ShardId;
2121
import org.opensearch.index.IndexSettings;
22+
import org.opensearch.index.merge.MergedSegmentTransferTracker;
2223
import org.opensearch.test.OpenSearchTestCase;
2324

2425
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
@@ -77,15 +78,15 @@ public void testSettingPrecedence() {
7778
IndexSettings indexSettings = new IndexSettings(newIndexMeta("test_index", indexBuilder.build()), nodeSettings);
7879
ShardId shardId = new ShardId("test_index", "test_uuid", 0);
7980

80-
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings);
81+
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings, new MergedSegmentTransferTracker());
8182

8283
// Should use cluster-level setting
8384
assertThat(scheduler.getForceMergeMBPerSec(), equalTo(75.0));
8485

8586
// Test with both index and cluster-level settings - index should take precedence
8687
indexBuilder.put(MAX_FORCE_MERGE_MB_PER_SEC_SETTING.getKey(), "25.0");
8788
indexSettings = new IndexSettings(newIndexMeta("test_index", indexBuilder.build()), nodeSettings);
88-
scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings);
89+
scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings, new MergedSegmentTransferTracker());
8990

9091
// Should use index-level setting
9192
assertThat(scheduler.getForceMergeMBPerSec(), equalTo(25.0));
@@ -104,7 +105,7 @@ public void testDisabledRateLimiting() {
104105
IndexSettings indexSettings = new IndexSettings(newIndexMeta("test_index", builder.build()), Settings.EMPTY);
105106
ShardId shardId = new ShardId("test_index", "test_uuid", 0);
106107

107-
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings);
108+
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings, new MergedSegmentTransferTracker());
108109

109110
// Should have no rate limiting
110111
assertThat(scheduler.getForceMergeMBPerSec(), equalTo(Double.POSITIVE_INFINITY));
@@ -130,7 +131,7 @@ public void testDynamicRateLimitUpdates() throws Exception {
130131
IndexSettings indexSettings = new IndexSettings(newIndexMeta("test_index", builder.build()), Settings.EMPTY);
131132
ShardId shardId = new ShardId("test_index", "test_uuid", 0);
132133

133-
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings);
134+
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings, new MergedSegmentTransferTracker());
134135
assertThat(scheduler.getForceMergeMBPerSec(), equalTo(10.0));
135136

136137
// Update to a different rate limit
@@ -190,7 +191,7 @@ public void testFallbackToClusterSettingWhenIndexSettingRemoved() throws Excepti
190191
IndexSettings indexSettings = new IndexSettings(newIndexMeta("test_index", builder.build()), nodeSettings);
191192
ShardId shardId = new ShardId("test_index", "test_uuid", 0);
192193

193-
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings);
194+
OpenSearchConcurrentMergeScheduler scheduler = new OpenSearchConcurrentMergeScheduler(shardId, indexSettings, new MergedSegmentTransferTracker());
194195

195196
// Should initially use index-level setting
196197
assertThat(scheduler.getForceMergeMBPerSec(), equalTo(25.0));

0 commit comments

Comments
 (0)