root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-18415: Fix for event queue metric and flaky test (#18416) 

Reviewers: Andrew Schofield <aschofield@confluent.io>
This commit is contained in:
Lianet Magrans 2025-01-08 14:31:10 +01:00 committed by GitHub
parent 0377e807ff
commit 0721d21a57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/ApplicationEventHandler.java
View File

@ -81,8 +81,10 @@ public class ApplicationEventHandler implements Closeable {
public void add(final ApplicationEvent event) { public void add(final ApplicationEvent event) {
Objects.requireNonNull(event, "ApplicationEvent provided to add must be non-null"); Objects.requireNonNull(event, "ApplicationEvent provided to add must be non-null");
event.setEnqueuedMs(time.milliseconds()); event.setEnqueuedMs(time.milliseconds());
// Record the updated queue size before actually adding the event to the queue
// to avoid race conditions (the background thread is continuously removing from this queue)
asyncConsumerMetrics.recordApplicationEventQueueSize(applicationEventQueue.size() + 1);
applicationEventQueue.add(event); applicationEventQueue.add(event);
asyncConsumerMetrics.recordApplicationEventQueueSize(applicationEventQueue.size());
wakeupNetworkThread(); wakeupNetworkThread();
} }

2
clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/BackgroundEventHandler.java
View File

@ -53,8 +53,8 @@ public class BackgroundEventHandler {
public void add(BackgroundEvent event) { public void add(BackgroundEvent event) {
Objects.requireNonNull(event, "BackgroundEvent provided to add must be non-null"); Objects.requireNonNull(event, "BackgroundEvent provided to add must be non-null");
event.setEnqueuedMs(time.milliseconds()); event.setEnqueuedMs(time.milliseconds());
asyncConsumerMetrics.recordBackgroundEventQueueSize(backgroundEventQueue.size() + 1);
backgroundEventQueue.add(event); backgroundEventQueue.add(event);
asyncConsumerMetrics.recordBackgroundEventQueueSize(backgroundEventQueue.size());
} }
/** /**

15
clients/src/test/java/org/apache/kafka/clients/consumer/internals/ApplicationEventHandlerTest.java
View File

@ -32,8 +32,9 @@ import org.junit.jupiter.api.Test;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
public class ApplicationEventHandlerTest { public class ApplicationEventHandlerTest {
private final Time time = new MockTime(); private final Time time = new MockTime();
@ -46,7 +47,7 @@ public class ApplicationEventHandlerTest {
@Test @Test
public void testRecordApplicationEventQueueSize() { public void testRecordApplicationEventQueueSize() {
try (Metrics metrics = new Metrics(); try (Metrics metrics = new Metrics();
AsyncConsumerMetrics asyncConsumerMetrics = new AsyncConsumerMetrics(metrics); AsyncConsumerMetrics asyncConsumerMetrics = spy(new AsyncConsumerMetrics(metrics));
ApplicationEventHandler applicationEventHandler = new ApplicationEventHandler( ApplicationEventHandler applicationEventHandler = new ApplicationEventHandler(
new LogContext(), new LogContext(),
time, time,
@ -59,15 +60,7 @@ public class ApplicationEventHandlerTest {
)) { )) {
// add event // add event
applicationEventHandler.add(new PollEvent(time.milliseconds())); applicationEventHandler.add(new PollEvent(time.milliseconds()));
assertEquals( verify(asyncConsumerMetrics).recordApplicationEventQueueSize(1);
1,
(double) metrics.metric(
metrics.metricName(
AsyncConsumerMetrics.APPLICATION_EVENT_QUEUE_SIZE_SENSOR_NAME,
ConsumerUtils.CONSUMER_METRIC_GROUP
)
).metricValue()
);
} }
} }
} }