Test: AckClusterUpdateSettingsTests - only set publish_timeout to 0 after green
This commit is contained in:
parent
9c8beb8220
commit
a2029ed6ec
|
@ -45,11 +45,8 @@ public class AckClusterUpdateSettingsTests extends ElasticsearchIntegrationTest
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Settings nodeSettings(int nodeOrdinal) {
|
protected Settings nodeSettings(int nodeOrdinal) {
|
||||||
//to test that the acknowledgement mechanism is working we better disable the wait for publish
|
|
||||||
//otherwise the operation is most likely acknowledged even if it doesn't support ack
|
|
||||||
return ImmutableSettings.builder()
|
return ImmutableSettings.builder()
|
||||||
.put(super.nodeSettings(nodeOrdinal))
|
.put(super.nodeSettings(nodeOrdinal))
|
||||||
.put(DiscoverySettings.PUBLISH_TIMEOUT, 0)
|
|
||||||
//make sure that enough concurrent reroutes can happen at the same time
|
//make sure that enough concurrent reroutes can happen at the same time
|
||||||
//we have a minimum of 2 nodes, and a maximum of 10 shards, thus 5 should be enough
|
//we have a minimum of 2 nodes, and a maximum of 10 shards, thus 5 should be enough
|
||||||
.put(ThrottlingAllocationDecider.CLUSTER_ROUTING_ALLOCATION_NODE_CONCURRENT_RECOVERIES, 5)
|
.put(ThrottlingAllocationDecider.CLUSTER_ROUTING_ALLOCATION_NODE_CONCURRENT_RECOVERIES, 5)
|
||||||
|
@ -66,11 +63,21 @@ public class AckClusterUpdateSettingsTests extends ElasticsearchIntegrationTest
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void removePublishTimeout() {
|
||||||
|
//to test that the acknowledgement mechanism is working we better disable the wait for publish
|
||||||
|
//otherwise the operation is most likely acknowledged even if it doesn't support ack
|
||||||
|
assertAcked(client().admin().cluster().prepareUpdateSettings().setTransientSettings(ImmutableSettings.builder().put(DiscoverySettings.PUBLISH_TIMEOUT, "0")));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testClusterUpdateSettingsAcknowledgement() {
|
public void testClusterUpdateSettingsAcknowledgement() {
|
||||||
createIndex("test");
|
createIndex("test");
|
||||||
ensureGreen();
|
ensureGreen();
|
||||||
|
|
||||||
|
// now that the cluster is stable, remove timeout
|
||||||
|
removePublishTimeout();
|
||||||
|
|
||||||
NodesInfoResponse nodesInfo = client().admin().cluster().prepareNodesInfo().get();
|
NodesInfoResponse nodesInfo = client().admin().cluster().prepareNodesInfo().get();
|
||||||
String excludedNodeId = null;
|
String excludedNodeId = null;
|
||||||
for (NodeInfo nodeInfo : nodesInfo) {
|
for (NodeInfo nodeInfo : nodesInfo) {
|
||||||
|
@ -111,6 +118,9 @@ public class AckClusterUpdateSettingsTests extends ElasticsearchIntegrationTest
|
||||||
.put("number_of_replicas", 0)).get();
|
.put("number_of_replicas", 0)).get();
|
||||||
ensureGreen();
|
ensureGreen();
|
||||||
|
|
||||||
|
// now that the cluster is stable, remove timeout
|
||||||
|
removePublishTimeout();
|
||||||
|
|
||||||
NodesInfoResponse nodesInfo = client().admin().cluster().prepareNodesInfo().get();
|
NodesInfoResponse nodesInfo = client().admin().cluster().prepareNodesInfo().get();
|
||||||
String excludedNodeId = null;
|
String excludedNodeId = null;
|
||||||
for (NodeInfo nodeInfo : nodesInfo) {
|
for (NodeInfo nodeInfo : nodesInfo) {
|
||||||
|
|
Loading…
Reference in New Issue