merlimat closed pull request #1952: Fix race in
MultiTopicsConsumerImpl#redeliverUnacknowledgedMessages
URL: https://github.com/apache/incubator-pulsar/pull/1952
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
index e7d3b26139..4be8f58a8e 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
@@ -502,12 +502,15 @@ String getHandlerName() {
@Override
public void redeliverUnacknowledgedMessages() {
- synchronized (this) {
+ lock.writeLock().lock();
+ try {
consumers.values().stream().forEach(consumer ->
consumer.redeliverUnacknowledgedMessages());
incomingMessages.clear();
unAckedMessageTracker.clear();
- resumeReceivingFromPausedConsumersIfNeeded();
+ } finally {
+ lock.writeLock().unlock();
}
+ resumeReceivingFromPausedConsumersIfNeeded();
}
@Override
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
