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

[TEST] For connection rules make TransportAddress the identity instead of DiscoveryNode. 

For unicast ping the DiscoveryNode identity is based on its id, which in that stage is a dummy value, this breaks any rule in the mock tran
However the TransportAddress is a valid value in unicast ping and all other places, so that is a better alternative.

Closes #6836
This commit is contained in:
Martijn van Groningen 2014-07-11 17:38:36 +02:00
parent 6e70edb0a4
commit b275393e01
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/java/org/elasticsearch/test/transport/MockTransportService.java
View File

@ -59,7 +59,7 @@ public class MockTransportService extends TransportService {
* Clears the rule associated with the provided node.
*/
public void clearRule(DiscoveryNode node) {
transport().transports.remove(node);
transport().transports.remove(node.getAddress());
}
/**
@ -97,7 +97,7 @@ public class MockTransportService extends TransportService {
*/
public void addFailToSendNoConnectRule(DiscoveryNode node, final Set<String> blockedActions) {
((LookupTestTransport) transport).transports.put(node, new DelegateTransport(original) {
((LookupTestTransport) transport).transports.put(node.getAddress(), new DelegateTransport(original) {
@Override
public void connectToNode(DiscoveryNode node) throws ConnectTransportException {
original.connectToNode(node);
@ -148,7 +148,7 @@ public class MockTransportService extends TransportService {
* @return <tt>true</tt> iff no other delegate was registered for this node before, otherwise <tt>false</tt>
*/
public boolean addDelegate(DiscoveryNode node, DelegateTransport transport) {
return transport().transports.put(node, transport) == null;
return transport().transports.put(node.getAddress(), transport) == null;
}
private LookupTestTransport transport() {
@ -161,18 +161,17 @@ public class MockTransportService extends TransportService {
*/
private static class LookupTestTransport extends DelegateTransport {
final ConcurrentMap<DiscoveryNode, Transport> transports = ConcurrentCollections.newConcurrentMap();
final ConcurrentMap<TransportAddress, Transport> transports = ConcurrentCollections.newConcurrentMap();
LookupTestTransport(Transport transport) {
super(transport);
}
private Transport getTransport(DiscoveryNode node) {
Transport transport = transports.get(node);
Transport transport = transports.get(node.getAddress());
if (transport != null) {
return transport;
}
// TODO, if we miss on node by UID, we should have an option to lookup based on address?
return this.transport;
}