Skip to content

MINOR: NetworkClient#disconnect should not erase connection info #3309

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

Closed
cmccabe wants to merge 3 commits into from
Closed

MINOR: NetworkClient#disconnect should not erase connection info #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb9020e
MINOR: NetworkClient#disconnect should not erase connection info
cmccabe Jun 12, 2017
cb1b620
Add unit test
cmccabe Jun 13, 2017
1c2d124
fix checkstyle
cmccabe Jun 13, 2017
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
2 changes: 1 addition & 1 deletion clients/src/main/java/org/apache/kafka/clients/NetworkClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public void disconnect(String nodeId) {
true, null, null));
}
}
connectionStates.remove(nodeId);
connectionStates.disconnected(nodeId, now);
if (log.isDebugEnabled()) {
log.debug("Manually disconnected from {}. Removed requests: {}.", nodeId,
Utils.join(requestTypes, ", "));
Expand Down
17 changes: 16 additions & 1 deletion 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 @@ -29,6 +29,7 @@
import org.apache.kafka.common.requests.ProduceRequest;
import org.apache.kafka.common.requests.ResponseHeader;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.test.DelayedReceive;
import org.apache.kafka.test.MockSelector;
import org.apache.kafka.test.TestUtils;
Expand Down Expand Up @@ -264,7 +265,21 @@ public void testDisconnectDuringUserMetadataRequest() {
assertEquals(1, responses.size());
assertTrue(responses.iterator().next().wasDisconnected());
}


@Test
public void testCallDisconnect() throws Exception {
awaitReady(client, node);
assertTrue("Expected NetworkClient to be ready to send to node " + node.idString(),
client.isReady(node, Time.SYSTEM.milliseconds()));
assertFalse("Did not expect connection to node " + node.idString() + " to be failed",
client.connectionFailed(node));
client.disconnect(node.idString());
assertFalse("Expected node " + node.idString() + " to be disconnected.",
client.isReady(node, Time.SYSTEM.milliseconds()));
assertTrue("Expected connection to node " + node.idString() + " to be failed after disconnect",
client.connectionFailed(node));
}

private static class TestCallbackHandler implements RequestCompletionHandler {
public boolean executed = false;
public ClientResponse response;
Expand Down