You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by lu...@apache.org on 2024/01/19 14:29:07 UTC

(kafka) 01/05: Bruno's comments

This is an automated email from the ASF dual-hosted git repository.

lucasbru pushed a commit to branch ctr_interceptors
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit 4434f4ba9b182fce22df501f2a98bcd2f01fc7d7
Author: Lucas Brutschy <lb...@confluent.io>
AuthorDate: Fri Jan 19 15:18:02 2024 +0100

    Bruno's comments
---
 .../consumer/internals/AsyncKafkaConsumer.java     |  4 +-
 .../consumer/internals/CommitRequestManager.java   |  2 +-
 .../internals/OffsetCommitCallbackInvoker.java     | 11 +++---
 .../internals/CommitRequestManagerTest.java        |  4 +-
 .../internals/OffsetCommitCallbackInvokerTest.java | 46 +++++++++++++++++++---
 5 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
index 8efa1f57ab8..48713957df0 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumer.java
@@ -766,7 +766,7 @@ public class AsyncKafkaConsumer<K, V> implements ConsumerDelegate<K, V> {
             future.whenComplete((r, t) -> {
 
                 if (t == null) {
-                    offsetCommitCallbackInvoker.submitCommitInterceptors(offsets);
+                    offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets);
                 }
 
                 if (callback == null) {
@@ -776,7 +776,7 @@ public class AsyncKafkaConsumer<K, V> implements ConsumerDelegate<K, V> {
                     return;
                 }
 
-                offsetCommitCallbackInvoker.submitUserCallback(callback, offsets, (Exception) t);
+                offsetCommitCallbackInvoker.enqueueUserCallbackInvocation(callback, offsets, (Exception) t);
             });
         } finally {
             release();
diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java
index ff90dd1893f..d0aa738cf8d 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CommitRequestManager.java
@@ -283,7 +283,7 @@ public class CommitRequestManager implements RequestManager, MemberStateListener
         return (response, throwable) -> {
             autoCommitState.ifPresent(autoCommitState -> autoCommitState.setInflightCommitStatus(false));
             if (throwable == null) {
-                offsetCommitCallbackInvoker.submitCommitInterceptors(allConsumedOffsets);
+                offsetCommitCallbackInvoker.enqueueInterceptorInvocation(allConsumedOffsets);
                 log.debug("Completed asynchronous auto-commit of offsets {}", allConsumedOffsets);
             } else if (throwable instanceof RetriableCommitFailedException) {
                 log.debug("Asynchronous auto-commit of offsets {} failed due to retriable error: {}",
diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvoker.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvoker.java
index be3a131af0f..db7770cbda8 100644
--- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvoker.java
+++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvoker.java
@@ -42,19 +42,19 @@ public class OffsetCommitCallbackInvoker {
     // Thread-safe queue to store user-defined callbacks and interceptors to be executed
     private final BlockingQueue<OffsetCommitCallbackTask> callbackQueue = new LinkedBlockingQueue<>();
 
-    public void submitCommitInterceptors(final Map<TopicPartition, OffsetAndMetadata> offsets) {
+    public void enqueueInterceptorInvocation(final Map<TopicPartition, OffsetAndMetadata> offsets) {
         if (!interceptors.isEmpty()) {
             callbackQueue.add(new OffsetCommitCallbackTask(
-                (innerOffsets, exception) -> interceptors.onCommit(innerOffsets),
+                (offsetsParam, exception) -> interceptors.onCommit(offsetsParam),
                 offsets,
                 null
             ));
         }
     }
 
-    public void submitUserCallback(final OffsetCommitCallback callback,
-                                   final Map<TopicPartition, OffsetAndMetadata> offsets,
-                                   final Exception exception) {
+    public void enqueueUserCallbackInvocation(final OffsetCommitCallback callback,
+                                              final Map<TopicPartition, OffsetAndMetadata> offsets,
+                                              final Exception exception) {
         callbackQueue.add(new OffsetCommitCallbackTask(callback, offsets, exception));
     }
 
@@ -67,7 +67,6 @@ public class OffsetCommitCallbackInvoker {
                     hasFencedException = true;
 
                 task.callback.onComplete(task.offsets, task.exception);
-
             }
         }
     }
diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java
index 288d74b5f6a..e233a56947c 100644
--- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java
@@ -385,7 +385,7 @@ public class CommitRequestManagerTest {
 
         // complete the unsent request to trigger interceptor
         futures.get(0).onComplete(buildOffsetCommitClientResponse(new OffsetCommitResponse(0, new HashMap<>())));
-        verify(offsetCommitCallbackInvoker).submitCommitInterceptors(
+        verify(offsetCommitCallbackInvoker).enqueueInterceptorInvocation(
             eq(Collections.singletonMap(t1p, new OffsetAndMetadata(100L)))
         );
     }
@@ -405,7 +405,7 @@ public class CommitRequestManagerTest {
         futures.get(0).onComplete(buildOffsetCommitClientResponse(
             new OffsetCommitResponse(0, Collections.singletonMap(t1p, Errors.NETWORK_EXCEPTION)))
         );
-        Mockito.verify(offsetCommitCallbackInvoker, never()).submitCommitInterceptors(any());
+        Mockito.verify(offsetCommitCallbackInvoker, never()).enqueueInterceptorInvocation(any());
     }
 
     @Test
diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java
index 3a60858b017..0c8a6dfaf0a 100644
--- a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/OffsetCommitCallbackInvokerTest.java
@@ -58,8 +58,8 @@ public class OffsetCommitCallbackInvokerTest {
         OffsetCommitCallback callback1 = mock(OffsetCommitCallback.class);
         OffsetCommitCallback callback2 = mock(OffsetCommitCallback.class);
 
-        offsetCommitCallbackInvoker.submitUserCallback(callback1, offsets1, null);
-        offsetCommitCallbackInvoker.submitUserCallback(callback2, offsets2, null);
+        offsetCommitCallbackInvoker.enqueueUserCallbackInvocation(callback1, offsets1, null);
+        offsetCommitCallbackInvoker.enqueueUserCallbackInvocation(callback2, offsets2, null);
         verify(callback1, never()).onComplete(any(), any());
         verify(callback2, never()).onComplete(any(), any());
 
@@ -72,6 +72,42 @@ public class OffsetCommitCallbackInvokerTest {
         inOrder.verifyNoMoreInteractions();
     }
 
+    @Test
+    public void testNoOnCommitOnEmptyInterceptors() {
+        final TopicPartition t0 = new TopicPartition("t0", 2);
+        Map<TopicPartition, OffsetAndMetadata> offsets1 =
+            Collections.singletonMap(t0, new OffsetAndMetadata(10L));
+        Map<TopicPartition, OffsetAndMetadata> offsets2 =
+            Collections.singletonMap(t0, new OffsetAndMetadata(20L));
+        when(consumerInterceptors.isEmpty()).thenReturn(true);
+
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets1);
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets2);
+        offsetCommitCallbackInvoker.executeCallbacks();
+        verify(consumerInterceptors, never()).onCommit(any());
+    }
+
+    @Test
+    public void testOnlyInterceptors() {
+        final TopicPartition t0 = new TopicPartition("t0", 2);
+        Map<TopicPartition, OffsetAndMetadata> offsets1 =
+            Collections.singletonMap(t0, new OffsetAndMetadata(10L));
+        Map<TopicPartition, OffsetAndMetadata> offsets2 =
+            Collections.singletonMap(t0, new OffsetAndMetadata(20L));
+        when(consumerInterceptors.isEmpty()).thenReturn(false);
+
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets1);
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets2);
+        verify(consumerInterceptors, never()).onCommit(any());
+
+        offsetCommitCallbackInvoker.executeCallbacks();
+        InOrder inOrder = inOrder(consumerInterceptors);
+        inOrder.verify(consumerInterceptors).onCommit(offsets1);
+        inOrder.verify(consumerInterceptors).onCommit(offsets2);
+
+        offsetCommitCallbackInvoker.executeCallbacks();
+        inOrder.verifyNoMoreInteractions();
+    }
 
     @Test
     public void testMixedCallbacksInterceptorsInvoked() {
@@ -83,9 +119,9 @@ public class OffsetCommitCallbackInvokerTest {
         OffsetCommitCallback callback1 = mock(OffsetCommitCallback.class);
         when(consumerInterceptors.isEmpty()).thenReturn(false);
 
-        offsetCommitCallbackInvoker.submitCommitInterceptors(offsets1);
-        offsetCommitCallbackInvoker.submitCommitInterceptors(offsets2);
-        offsetCommitCallbackInvoker.submitUserCallback(callback1, offsets1, null);
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets1);
+        offsetCommitCallbackInvoker.enqueueInterceptorInvocation(offsets2);
+        offsetCommitCallbackInvoker.enqueueUserCallbackInvocation(callback1, offsets1, null);
         verify(callback1, never()).onComplete(any(), any());
         verify(consumerInterceptors, never()).onCommit(any());