Skip to content

Commit 77d0c79

Browse files
authored
Adjust load and timeout in testShrinkIndexPrimaryTerm (#42098)
This test can create and shuffle 2*(3*5*7) = 210 shards which is quite heavy for our CI. This commit reduces the load, so we don't timeout on CI. Closes #28153
1 parent 750eb6e commit 77d0c79

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.elasticsearch.test.junit.annotations.TestLogging;
6666

6767
import java.util.Arrays;
68-
import java.util.List;
6968
import java.util.Map;
7069
import java.util.stream.IntStream;
7170

@@ -165,11 +164,8 @@ public void testCreateShrinkIndexToN() {
165164
}
166165

167166
public void testShrinkIndexPrimaryTerm() throws Exception {
168-
final List<Integer> factors = Arrays.asList(2, 3, 5, 7);
169-
final List<Integer> numberOfShardsFactors = randomSubsetOf(scaledRandomIntBetween(1, factors.size() - 1), factors);
170-
final int numberOfShards = numberOfShardsFactors.stream().reduce(1, (x, y) -> x * y);
171-
final int numberOfTargetShards = randomSubsetOf(randomInt(numberOfShardsFactors.size() - 1), numberOfShardsFactors)
172-
.stream().reduce(1, (x, y) -> x * y);
167+
int numberOfShards = randomIntBetween(2, 20);
168+
int numberOfTargetShards = randomValueOtherThanMany(n -> numberOfShards % n != 0, () -> randomIntBetween(1, numberOfShards - 1));
173169
internalCluster().ensureAtLeastNumDataNodes(2);
174170
prepareCreate("source").setSettings(Settings.builder().put(indexSettings()).put("number_of_shards", numberOfShards)).get();
175171

@@ -218,7 +214,7 @@ public void testShrinkIndexPrimaryTerm() throws Exception {
218214
final Settings.Builder prepareShrinkSettings =
219215
Settings.builder().put("index.routing.allocation.require._name", mergeNode).put("index.blocks.write", true);
220216
client().admin().indices().prepareUpdateSettings("source").setSettings(prepareShrinkSettings).get();
221-
ensureGreen();
217+
ensureGreen(TimeValue.timeValueSeconds(120)); // needs more than the default to relocate many shards
222218

223219
final IndexMetaData indexMetaData = indexMetaData(client(), "source");
224220
final long beforeShrinkPrimaryTerm = IntStream.range(0, numberOfShards).mapToLong(indexMetaData::primaryTerm).max().getAsLong();
@@ -228,7 +224,7 @@ public void testShrinkIndexPrimaryTerm() throws Exception {
228224
Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", numberOfTargetShards).build();
229225
assertAcked(client().admin().indices().prepareResizeIndex("source", "target").setSettings(shrinkSettings).get());
230226

231-
ensureGreen();
227+
ensureGreen(TimeValue.timeValueSeconds(120));
232228

233229
final IndexMetaData afterShrinkIndexMetaData = indexMetaData(client(), "target");
234230
for (int shardId = 0; shardId < numberOfTargetShards; shardId++) {

0 commit comments

Comments
 (0)