AndrewJSchofield commented on code in PR #18562:
URL: https://github.com/apache/kafka/pull/18562#discussion_r1918162932
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java:
##########
@@ -881,6 +889,116 @@ public void testShareFetchWithSubscriptionChange() {
metrics.metrics().get(metrics.metricInstance(shareFetchMetricsRegistry.acknowledgementSendTotal)).metricValue());
}
+ @Test
+ public void testShareFetchWithSubscriptionChangeMultipleNodes() {
+ buildRequestManager();
+
+ subscriptions.subscribeToShareGroup(Collections.singleton(topicName));
+ Set<TopicPartition> partitions = new HashSet<>();
+ partitions.add(tp0);
+ partitions.add(tp1);
+ subscriptions.assignFromSubscribed(Collections.singletonList(tp0));
+
+ client.updateMetadata(
+ RequestTestUtils.metadataUpdateWithIds(2,
singletonMap(topicName, 2),
+ tp -> validLeaderEpoch, topicIds, false));
+ Node nodeId0 = metadata.fetch().nodeById(0);
+ Node nodeId1 = metadata.fetch().nodeById(1);
+ Node tp0Leader = metadata.fetch().leaderFor(tp0);
+ Node tp1Leader = metadata.fetch().leaderFor(tp1);
+
+ assertEquals(nodeId0, tp0Leader);
+ assertEquals(nodeId1, tp1Leader);
+
+ assertEquals(1, sendFetches());
+ assertFalse(shareConsumeRequestManager.hasCompletedFetches());
+
+ client.prepareResponse(fullFetchResponse(tip0, records,
emptyAcquiredRecords, Errors.NONE));
+ networkClientDelegate.poll(time.timer(0));
+ assertTrue(shareConsumeRequestManager.hasCompletedFetches());
+
+ Acknowledgements acknowledgements = Acknowledgements.empty();
+ acknowledgements.add(0L, AcknowledgeType.ACCEPT);
+ acknowledgements.add(1L, AcknowledgeType.RELEASE);
+ acknowledgements.add(2L, AcknowledgeType.ACCEPT);
+
+ // Send acknowledgements via ShareFetch
+ shareConsumeRequestManager.fetch(Collections.singletonMap(tip0,
acknowledgements));
+ fetchRecords();
+ // Subscription changes.
+ subscriptions.assignFromSubscribed(Collections.singletonList(tp1));
+
+ NetworkClientDelegate.PollResult pollResult =
shareConsumeRequestManager.sendFetchesReturnPollResult();
+ assertEquals(2, pollResult.unsentRequests.size());
Review Comment:
You could validate the nodes for the `unsentRequests` too in both the new
tests.
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java:
##########
@@ -881,6 +889,116 @@ public void testShareFetchWithSubscriptionChange() {
metrics.metrics().get(metrics.metricInstance(shareFetchMetricsRegistry.acknowledgementSendTotal)).metricValue());
}
+ @Test
+ public void testShareFetchWithSubscriptionChangeMultipleNodes() {
+ buildRequestManager();
+
+ subscriptions.subscribeToShareGroup(Collections.singleton(topicName));
+ Set<TopicPartition> partitions = new HashSet<>();
+ partitions.add(tp0);
+ partitions.add(tp1);
+ subscriptions.assignFromSubscribed(Collections.singletonList(tp0));
+
+ client.updateMetadata(
+ RequestTestUtils.metadataUpdateWithIds(2,
singletonMap(topicName, 2),
+ tp -> validLeaderEpoch, topicIds, false));
+ Node nodeId0 = metadata.fetch().nodeById(0);
+ Node nodeId1 = metadata.fetch().nodeById(1);
+ Node tp0Leader = metadata.fetch().leaderFor(tp0);
+ Node tp1Leader = metadata.fetch().leaderFor(tp1);
+
+ assertEquals(nodeId0, tp0Leader);
+ assertEquals(nodeId1, tp1Leader);
+
+ assertEquals(1, sendFetches());
+ assertFalse(shareConsumeRequestManager.hasCompletedFetches());
+
+ client.prepareResponse(fullFetchResponse(tip0, records,
emptyAcquiredRecords, Errors.NONE));
+ networkClientDelegate.poll(time.timer(0));
+ assertTrue(shareConsumeRequestManager.hasCompletedFetches());
+
+ Acknowledgements acknowledgements = Acknowledgements.empty();
+ acknowledgements.add(0L, AcknowledgeType.ACCEPT);
+ acknowledgements.add(1L, AcknowledgeType.RELEASE);
+ acknowledgements.add(2L, AcknowledgeType.ACCEPT);
+
+ // Send acknowledgements via ShareFetch
+ shareConsumeRequestManager.fetch(Collections.singletonMap(tip0,
acknowledgements));
+ fetchRecords();
+ // Subscription changes.
+ subscriptions.assignFromSubscribed(Collections.singletonList(tp1));
+
+ NetworkClientDelegate.PollResult pollResult =
shareConsumeRequestManager.sendFetchesReturnPollResult();
+ assertEquals(2, pollResult.unsentRequests.size());
+
+ ShareFetchRequest.Builder builder1 = (ShareFetchRequest.Builder)
pollResult.unsentRequests.get(0).requestBuilder();
Review Comment:
Is it certain that that requests will be in this order? `unsentRequests` is
just a list, not a map, so I wonder whether there is the possibility that these
requests come out in the other order occasionally making the test fail.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
