kevin-wu24 commented on code in PR #22505:
URL: https://github.com/apache/kafka/pull/22505#discussion_r3382326631
##########
raft/src/main/java/org/apache/kafka/raft/internals/BlockingMessageQueue.java:
##########
@@ -17,60 +17,51 @@
package org.apache.kafka.raft.internals;
import org.apache.kafka.common.errors.InterruptException;
-import org.apache.kafka.common.protocol.ApiMessage;
-import org.apache.kafka.raft.RaftMessage;
import org.apache.kafka.raft.RaftMessageQueue;
+import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
public class BlockingMessageQueue implements RaftMessageQueue {
- private static final RaftMessage WAKEUP_MESSAGE = new RaftMessage() {
- @Override
- public int correlationId() {
- return 0;
- }
-
- @Override
- public ApiMessage data() {
- return null;
- }
- };
-
- private final BlockingQueue<RaftMessage> queue = new
LinkedBlockingQueue<>();
- private final AtomicInteger size = new AtomicInteger(0);
+ private final BlockingQueue<QueueEntry> queue = new
LinkedBlockingQueue<>();
+ private final AtomicInteger messageCount = new AtomicInteger(0);
@Override
- public RaftMessage poll(long timeoutMs) {
+ public Optional<QueueEntry> poll(long timeoutMs) {
try {
- RaftMessage message = queue.poll(timeoutMs, TimeUnit.MILLISECONDS);
- if (message == null || message == WAKEUP_MESSAGE) {
- return null;
- } else {
- size.decrementAndGet();
- return message;
+ var entry = queue.poll(timeoutMs, TimeUnit.MILLISECONDS);
+ while (entry != null && entry.message() == null) {
+ // Drain the queue of all of the wakeup events
+ entry = queue.poll();
+ }
+ if (entry != null) {
+ messageCount.decrementAndGet();
}
+ return Optional.ofNullable(entry);
} catch (InterruptedException e) {
throw new InterruptException(e);
}
}
@Override
- public void add(RaftMessage message) {
- queue.add(message);
- size.incrementAndGet();
+ public void add(QueueEntry entry) {
+ queue.add(entry);
+ if (entry.message() != null) {
+ messageCount.incrementAndGet();
+ }
}
@Override
public boolean isEmpty() {
- return size.get() == 0;
+ return messageCount.get() == 0;
}
@Override
public void wakeup() {
- queue.add(WAKEUP_MESSAGE);
+ queue.add(new QueueEntry(null));
Review Comment:
I see. I think I read this wrong. When we exit the while loop, we either
have an empty queue and return an empty optional to the caller, or a non-wakeup
message. The wakeup message is still doing its job of making the blocking poll
call return. Apologies for the confusion.
--
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]
