Skip to content

KAFKA-12948: Remove node from ClusterConnectionStates.connectingNodes when node is removed #10882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rajinisivaram merged 1 commit into from
Jun 15, 2021
+34 −0
Merged

KAFKA-12948: Remove node from ClusterConnectionStates.connectingNodes when node is removed #10882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ private void updateConnectionSetupTimeout(NodeConnectionState nodeState) {
*/
public void remove(String id) {
nodeState.remove(id);
connectingNodes.remove(id);
}

/**
Expand Down
33 changes: 33 additions & 0 deletions clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,39 @@ public void testFailedConnectionToFirstAddressAfterReconnect() {
assertEquals(2, mockHostResolver.resolutionCount());
}

@Test
public void testCloseConnectingNode() {
Cluster cluster = TestUtils.clusterWith(2);
Node node0 = cluster.nodeById(0);
Node node1 = cluster.nodeById(1);
client.ready(node0, time.milliseconds());
selector.serverConnectionBlocked(node0.idString());
client.poll(1, time.milliseconds());
client.close(node0.idString());

// Poll without any connections should return without exceptions
client.poll(0, time.milliseconds());
assertFalse(NetworkClientUtils.isReady(client, node0, time.milliseconds()));
assertFalse(NetworkClientUtils.isReady(client, node1, time.milliseconds()));

// Connection to new node should work
client.ready(node1, time.milliseconds());
ByteBuffer buffer = RequestTestUtils.serializeResponseWithHeader(defaultApiVersionsResponse(), ApiKeys.API_VERSIONS.latestVersion(), 0);
selector.delayedReceive(new DelayedReceive(node1.idString(), new NetworkReceive(node1.idString(), buffer)));
while (!client.ready(node1, time.milliseconds()))
client.poll(1, time.milliseconds());
assertTrue(client.isReady(node1, time.milliseconds()));
selector.clear();

// New connection to node closed earlier should work
client.ready(node0, time.milliseconds());
buffer = RequestTestUtils.serializeResponseWithHeader(defaultApiVersionsResponse(), ApiKeys.API_VERSIONS.latestVersion(), 1);
selector.delayedReceive(new DelayedReceive(node0.idString(), new NetworkReceive(node0.idString(), buffer)));
while (!client.ready(node0, time.milliseconds()))
client.poll(1, time.milliseconds());
assertTrue(client.isReady(node0, time.milliseconds()));
}

private RequestHeader parseHeader(ByteBuffer buffer) {
buffer.getInt(); // skip size
return RequestHeader.parse(buffer.slice());
Expand Down