71
71
import org .elasticsearch .action .search .SearchTransportService ;
72
72
import org .elasticsearch .action .search .TransportSearchAction ;
73
73
import org .elasticsearch .action .support .ActionFilters ;
74
+ import org .elasticsearch .action .support .ActionTestUtils ;
74
75
import org .elasticsearch .action .support .ActiveShardCount ;
75
76
import org .elasticsearch .action .support .AutoCreateIndex ;
76
77
import org .elasticsearch .action .support .DestructiveOperations ;
@@ -713,7 +714,7 @@ private final class TestClusterNodes {
713
714
private final Map <String , TestClusterNode > nodes = new LinkedHashMap <>();
714
715
715
716
/**
716
- * Node ids that are disconnected from all other nodes.
717
+ * Node names that are disconnected from all other nodes.
717
718
*/
718
719
private final Set <String > disconnectedNodes = new HashSet <>();
719
720
@@ -793,11 +794,11 @@ public Optional<TestClusterNode> randomDataNode(String... excludedNames) {
793
794
}
794
795
795
796
public void disconnectNode (TestClusterNode node ) {
796
- if (disconnectedNodes .contains (node .node .getId ())) {
797
+ if (disconnectedNodes .contains (node .node .getName ())) {
797
798
return ;
798
799
}
799
800
testClusterNodes .nodes .values ().forEach (n -> n .transportService .getConnectionManager ().disconnectFromNode (node .node ));
800
- disconnectedNodes .add (node .node .getId ());
801
+ disconnectedNodes .add (node .node .getName ());
801
802
}
802
803
803
804
public void clearNetworkDisruptions () {
@@ -806,7 +807,9 @@ public void clearNetworkDisruptions() {
806
807
disconnectedNodes .forEach (nodeName -> {
807
808
if (testClusterNodes .nodes .containsKey (nodeName )) {
808
809
final DiscoveryNode node = testClusterNodes .nodes .get (nodeName ).node ;
809
- testClusterNodes .nodes .values ().forEach (n -> n .transportService .openConnection (node , null ));
810
+ testClusterNodes .nodes .values ().forEach (
811
+ n -> n .transportService .openConnection (node , null ,
812
+ ActionTestUtils .assertNoFailureListener (c -> logger .debug ("--> Connected [{}] to [{}]" , n .node , node ))));
810
813
}
811
814
});
812
815
}
@@ -899,7 +902,7 @@ protected ConnectionStatus getConnectionStatus(DiscoveryNode destination) {
899
902
if (nodes .containsKey (node .getName ()) == false || nodes .containsKey (destination .getName ()) == false ) {
900
903
return ConnectionStatus .DISCONNECTED ;
901
904
}
902
- return disconnectedNodes .contains (node .getId ()) || disconnectedNodes .contains (destination .getId ())
905
+ return disconnectedNodes .contains (node .getName ()) || disconnectedNodes .contains (destination .getName ())
903
906
? ConnectionStatus .DISCONNECTED : ConnectionStatus .CONNECTED ;
904
907
}
905
908
0 commit comments