[TEST] Randomized number of replicas between 0 and the number of data nodes - 1 (rather than just between 0 and 1)
Closes #5896
This commit is contained in:
parent
3e63d530f8
commit
6eb655380c
|
@ -20,6 +20,7 @@
|
||||||
package org.elasticsearch.test;
|
package org.elasticsearch.test;
|
||||||
|
|
||||||
import com.carrotsearch.hppc.ObjectArrayList;
|
import com.carrotsearch.hppc.ObjectArrayList;
|
||||||
|
import com.carrotsearch.randomizedtesting.RandomizedTest;
|
||||||
import com.carrotsearch.randomizedtesting.generators.RandomInts;
|
import com.carrotsearch.randomizedtesting.generators.RandomInts;
|
||||||
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
|
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
|
||||||
import org.apache.lucene.store.StoreRateLimiting;
|
import org.apache.lucene.store.StoreRateLimiting;
|
||||||
|
@ -156,7 +157,7 @@ public abstract class ImmutableTestCluster implements Iterable<Client> {
|
||||||
// which is the case in the CloseIndexDisableCloseAllTests
|
// which is the case in the CloseIndexDisableCloseAllTests
|
||||||
if ("_all".equals(indices[0])) {
|
if ("_all".equals(indices[0])) {
|
||||||
ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().execute().actionGet();
|
ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().execute().actionGet();
|
||||||
ObjectArrayList<String> concreteIndices = new ObjectArrayList<String>();
|
ObjectArrayList<String> concreteIndices = new ObjectArrayList<>();
|
||||||
for (IndexMetaData indexMetaData : clusterStateResponse.getState().metaData()) {
|
for (IndexMetaData indexMetaData : clusterStateResponse.getState().metaData()) {
|
||||||
concreteIndices.add(indexMetaData.getIndex());
|
concreteIndices.add(indexMetaData.getIndex());
|
||||||
}
|
}
|
||||||
|
@ -234,8 +235,8 @@ public abstract class ImmutableTestCluster implements Iterable<Client> {
|
||||||
setRandomSettings(random, ImmutableSettings.builder())
|
setRandomSettings(random, ImmutableSettings.builder())
|
||||||
.put(SETTING_INDEX_SEED, random.nextLong())
|
.put(SETTING_INDEX_SEED, random.nextLong())
|
||||||
.put(SETTING_NUMBER_OF_SHARDS, RandomInts.randomIntBetween(random, DEFAULT_MIN_NUM_SHARDS, DEFAULT_MAX_NUM_SHARDS))
|
.put(SETTING_NUMBER_OF_SHARDS, RandomInts.randomIntBetween(random, DEFAULT_MIN_NUM_SHARDS, DEFAULT_MAX_NUM_SHARDS))
|
||||||
.put(SETTING_NUMBER_OF_REPLICAS, RandomInts.randomIntBetween(random, 0, 1));
|
//use either 0 or 1 replica, yet a higher amount when possible, but only rarely
|
||||||
|
.put(SETTING_NUMBER_OF_REPLICAS, RandomInts.randomIntBetween(random, 0, random.nextInt(10) > 0 ? 1 : dataNodes() - 1));
|
||||||
client().admin().indices().preparePutTemplate("random_index_template")
|
client().admin().indices().preparePutTemplate("random_index_template")
|
||||||
.setTemplate("*")
|
.setTemplate("*")
|
||||||
.setOrder(0)
|
.setOrder(0)
|
||||||
|
|
Loading…
Reference in New Issue