honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Discovery: Removed unnecessary DiscoveryService reference from LocalDiscover, which causes circular Guice dependencies errors.

This commit is contained in:
Martijn van Groningen 2014-11-09 22:30:39 +00:00
parent 7590629531
commit 0b15859e33
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
View File

@ -58,7 +58,6 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
private final TransportService transportService; private final TransportService transportService;
private final ClusterService clusterService; private final ClusterService clusterService;
private final DiscoveryService discoveryService;
private final DiscoveryNodeService discoveryNodeService; private final DiscoveryNodeService discoveryNodeService;
private AllocationService allocationService; private AllocationService allocationService;
private final ClusterName clusterName; private final ClusterName clusterName;
@ -78,7 +77,7 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
@Inject @Inject
public LocalDiscovery(Settings settings, ClusterName clusterName, TransportService transportService, ClusterService clusterService, public LocalDiscovery(Settings settings, ClusterName clusterName, TransportService transportService, ClusterService clusterService,
DiscoveryNodeService discoveryNodeService, Version version, DiscoverySettings discoverySettings, DiscoveryService discoveryService) { DiscoveryNodeService discoveryNodeService, Version version, DiscoverySettings discoverySettings) {
super(settings); super(settings);
this.clusterName = clusterName; this.clusterName = clusterName;
this.clusterService = clusterService; this.clusterService = clusterService;
@ -86,7 +85,6 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
this.discoveryNodeService = discoveryNodeService; this.discoveryNodeService = discoveryNodeService;
this.version = version; this.version = version;
this.discoverySettings = discoverySettings; this.discoverySettings = discoverySettings;
this.discoveryService = discoveryService;
} }
@Override @Override
@ -308,7 +306,7 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
// ignore cluster state messages that do not include "me", not in the game yet... // ignore cluster state messages that do not include "me", not in the game yet...
if (nodeSpecificClusterState.nodes().localNode() != null) { if (nodeSpecificClusterState.nodes().localNode() != null) {
assert nodeSpecificClusterState.nodes().masterNode() != null : "received a cluster state without a master"; assert nodeSpecificClusterState.nodes().masterNode() != null : "received a cluster state without a master";
assert !nodeSpecificClusterState.blocks().hasGlobalBlock(discoveryService.getNoMasterBlock()) : "received a cluster state with a master block"; assert !nodeSpecificClusterState.blocks().hasGlobalBlock(discoverySettings.getNoMasterBlock()) : "received a cluster state with a master block";
discovery.clusterService.submitStateUpdateTask("local-disco-receive(from master)", new ProcessedClusterStateNonMasterUpdateTask() { discovery.clusterService.submitStateUpdateTask("local-disco-receive(from master)", new ProcessedClusterStateNonMasterUpdateTask() {
@Override @Override
@ -317,7 +315,7 @@ public class LocalDiscovery extends AbstractLifecycleComponent<Discovery> implem
return currentState; return currentState;
} }
if (currentState.blocks().hasGlobalBlock(discoveryService.getNoMasterBlock())) { if (currentState.blocks().hasGlobalBlock(discoverySettings.getNoMasterBlock())) {
// its a fresh update from the master as we transition from a start of not having a master to having one // its a fresh update from the master as we transition from a start of not having a master to having one
logger.debug("got first state from fresh master [{}]", nodeSpecificClusterState.nodes().masterNodeId()); logger.debug("got first state from fresh master [{}]", nodeSpecificClusterState.nodes().masterNodeId());
return nodeSpecificClusterState; return nodeSpecificClusterState;