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

Fix Broken Network Disruption in SnapshotResiliencyTests (#49216) (#49231) 

The network disruption was acting on node ids and node names
which made reconnects not work. Moved all usages to node names
to fix this. Since the map of all nodes in the test is indexed
by name this was easier to work with.
This commit is contained in:
Armin Braun 2019-11-18 12:02:27 +01:00 committed by GitHub
parent af797a77a1
commit 42268f0b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
View File

@ -71,6 +71,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchTransportService;
import org.elasticsearch.action.search.TransportSearchAction;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.ActionTestUtils;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.AutoCreateIndex;
import org.elasticsearch.action.support.DestructiveOperations;
@ -713,7 +714,7 @@ public class SnapshotResiliencyTests extends ESTestCase {
private final Map<String, TestClusterNode> nodes = new LinkedHashMap<>();
/**
* Node ids that are disconnected from all other nodes.
* Node names that are disconnected from all other nodes.
*/
private final Set<String> disconnectedNodes = new HashSet<>();
@ -793,11 +794,11 @@ public class SnapshotResiliencyTests extends ESTestCase {
}
public void disconnectNode(TestClusterNode node) {
if (disconnectedNodes.contains(node.node.getId())) {
if (disconnectedNodes.contains(node.node.getName())) {
return;
}
testClusterNodes.nodes.values().forEach(n -> n.transportService.getConnectionManager().disconnectFromNode(node.node));
disconnectedNodes.add(node.node.getId());
disconnectedNodes.add(node.node.getName());
}
public void clearNetworkDisruptions() {
@ -806,7 +807,9 @@ public class SnapshotResiliencyTests extends ESTestCase {
disconnectedNodes.forEach(nodeName -> {
if (testClusterNodes.nodes.containsKey(nodeName)) {
final DiscoveryNode node = testClusterNodes.nodes.get(nodeName).node;
testClusterNodes.nodes.values().forEach(n -> n.transportService.openConnection(node, null));
testClusterNodes.nodes.values().forEach(
n -> n.transportService.openConnection(node, null,
ActionTestUtils.assertNoFailureListener(c -> logger.debug("--> Connected [{}] to [{}]", n.node, node))));
}
});
}
@ -899,7 +902,7 @@ public class SnapshotResiliencyTests extends ESTestCase {
if (nodes.containsKey(node.getName()) == false || nodes.containsKey(destination.getName()) == false) {
return ConnectionStatus.DISCONNECTED;
}
return disconnectedNodes.contains(node.getId()) || disconnectedNodes.contains(destination.getId())
return disconnectedNodes.contains(node.getName()) || disconnectedNodes.contains(destination.getName())
? ConnectionStatus.DISCONNECTED : ConnectionStatus.CONNECTED;
}