Skip to content
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

HOTFIX: testInitTransactionTimeout should use prepareResponse instead of respond #8179

Merged
merged 4 commits into from
Feb 27, 2020
Merged

HOTFIX: testInitTransactionTimeout should use prepareResponse instead of respond #8179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0459f97
check inflight requests to determine whether to use respond or prepar…
Feb 26, 2020
51f798e
avoid check
Feb 26, 2020
7c70978
use one time poll
Feb 27, 2020
6c04a30
prepare response with matcher
Feb 27, 2020
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
7 changes: 1 addition & 6 deletions clients/src/test/java/org/apache/kafka/clients/MockClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,7 @@
* A mock network client for use testing code
*/
public class MockClient implements KafkaClient {
public static final RequestMatcher ALWAYS_TRUE = new RequestMatcher() {
@Override
public boolean matches(AbstractRequest body) {
return true;
}
};
public static final RequestMatcher ALWAYS_TRUE = body -> true;

private static class FutureResponse {
private final Node node;
Expand Down
6 changes: 5 additions & 1 deletion clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,11 @@ public void testInitTransactionTimeout() {

assertThrows(TimeoutException.class, producer::initTransactions);

client.respond(FindCoordinatorResponse.prepareResponse(Errors.NONE, host1));
client.prepareResponse(
request -> request instanceof FindCoordinatorRequest &&
((FindCoordinatorRequest) request).data().keyType() == FindCoordinatorRequest.CoordinatorType.TRANSACTION.id(),
FindCoordinatorResponse.prepareResponse(Errors.NONE, host1));

client.prepareResponse(initProducerIdResponse(1L, (short) 5, Errors.NONE));

// retry initialization should work
Expand Down