Tests: Tweaking static bwc tests to improve stability

This commit is contained in:
Ryan Ernst 2015-01-23 13:59:42 -08:00
parent 54d01c48cb
commit dfc2c9f3a1
1 changed files with 2 additions and 2 deletions

View File

@ -126,7 +126,6 @@ public class OldIndexBackwardsCompatibilityTests extends StaticIndexBackwardComp
public void testOldIndexes() throws Exception { public void testOldIndexes() throws Exception {
Collections.shuffle(indexes, getRandom()); Collections.shuffle(indexes, getRandom());
for (String index : indexes) { for (String index : indexes) {
logMemoryStats();
logger.info("Testing old index " + index); logger.info("Testing old index " + index);
assertOldIndexWorks(index); assertOldIndexWorks(index);
} }
@ -137,6 +136,7 @@ public class OldIndexBackwardsCompatibilityTests extends StaticIndexBackwardComp
.put(InternalNode.HTTP_ENABLED, true) // for _upgrade .put(InternalNode.HTTP_ENABLED, true) // for _upgrade
.build(); .build();
loadIndex(index, settings); loadIndex(index, settings);
logMemoryStats();
assertBasicSearchWorks(); assertBasicSearchWorks();
assertRealtimeGetWorks(); assertRealtimeGetWorks();
assertNewReplicasWork(); assertNewReplicasWork();
@ -193,7 +193,7 @@ public class OldIndexBackwardsCompatibilityTests extends StaticIndexBackwardComp
.put(InternalNode.HTTP_ENABLED, true) // for _upgrade .put(InternalNode.HTTP_ENABLED, true) // for _upgrade
.build()); .build());
} }
ensureGreen("test"); client().admin().cluster().prepareHealth("test").setWaitForNodes("" + (numReplicas + 1));
assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder() assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder()
.put("number_of_replicas", numReplicas)).execute().actionGet()); .put("number_of_replicas", numReplicas)).execute().actionGet());
// This can take a while when the number of replicas is greater than cluster.routing.allocation.node_concurrent_recoveries // This can take a while when the number of replicas is greater than cluster.routing.allocation.node_concurrent_recoveries