diff options
| author | Boaz Leskes <b.leskes@gmail.com> | 2016-05-27 08:44:20 +0200 |
|---|---|---|
| committer | Boaz Leskes <b.leskes@gmail.com> | 2016-05-27 08:44:20 +0200 |
| commit | 318a4e3ef6e4594619cbe3adcc41494fa23fa569 (patch) | |
| tree | a0ea00e31b941e954629b95b9bd1fe980e66e9f4 /plugins/repository-azure | |
| parent | fb763c1e8e31176398cbd07942f9adf9edc3f937 (diff) | |
Introduce dedicated master nodes in testing infrastructure (#18514)
This PR changes the InternalTestCluster to support dedicated master nodes. The creation of dedicated master nodes can be controlled using a new `supportsMasterNodes` parameter to the ClusterScope annotation. If set to true (the default), dedicated master nodes will randomly be used. If set to false, no master nodes will be created and data nodes will also be allowed to become masters. If active, test runs will either have 1 or 3 masternodes
Diffstat (limited to 'plugins/repository-azure')
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreServiceIntegTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreServiceIntegTests.java index 2c50deafb5..9ac15cae5a 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreServiceIntegTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreServiceIntegTests.java @@ -36,6 +36,7 @@ import static org.hamcrest.Matchers.greaterThan; @ESIntegTestCase.ClusterScope( scope = ESIntegTestCase.Scope.SUITE, + supportsDedicatedMasters = false, numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0) diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java index 79b41a355b..c062e765c3 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java @@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.greaterThan; */ @ClusterScope( scope = ESIntegTestCase.Scope.SUITE, - numDataNodes = 1, + supportsDedicatedMasters = false, numDataNodes = 1, transportClientRatio = 0.0) public class AzureSnapshotRestoreTests extends AbstractAzureWithThirdPartyIntegTestCase { private String getRepositoryPath() { |