Skip to content

Commit f5d3500

Browse files
committed
ZenDiscovery constructor needs ElectMasterService instance
Introduced in #7336 (elasticsearch 1.4 and 2.0), we need to change AzureDiscovery constructor. Closes #34.
1 parent b65373b commit f5d3500

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/org/elasticsearch/discovery/azure/AzureDiscovery.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.elasticsearch.common.settings.Settings;
3131
import org.elasticsearch.discovery.DiscoverySettings;
3232
import org.elasticsearch.discovery.zen.ZenDiscovery;
33+
import org.elasticsearch.discovery.zen.elect.ElectMasterService;
3334
import org.elasticsearch.discovery.zen.ping.ZenPing;
3435
import org.elasticsearch.discovery.zen.ping.ZenPingService;
3536
import org.elasticsearch.discovery.zen.ping.unicast.UnicastZenPing;
@@ -48,9 +49,9 @@ public class AzureDiscovery extends ZenDiscovery {
4849
public AzureDiscovery(Settings settings, ClusterName clusterName, ThreadPool threadPool, TransportService transportService,
4950
ClusterService clusterService, NodeSettingsService nodeSettingsService, ZenPingService pingService,
5051
DiscoveryNodeService discoveryNodeService, AzureComputeService azureService, NetworkService networkService,
51-
DiscoverySettings discoverySettings) {
52+
DiscoverySettings discoverySettings, ElectMasterService electMasterService) {
5253
super(settings, clusterName, threadPool, transportService, clusterService, nodeSettingsService,
53-
discoveryNodeService, pingService, Version.CURRENT, discoverySettings);
54+
discoveryNodeService, pingService, electMasterService, Version.CURRENT, discoverySettings);
5455
if (settings.getAsBoolean("cloud.enabled", true)) {
5556
ImmutableList<? extends ZenPing> zenPings = pingService.zenPings();
5657
UnicastZenPing unicastZenPing = null;

0 commit comments

Comments
 (0)