lhotari commented on code in PR #19446:
URL: https://github.com/apache/pulsar/pull/19446#discussion_r1098244731
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2813,21 +2824,30 @@ public void removedConsumer(Consumer consumer) {
@Override
public void removedProducer(Producer producer) {
- safelyRemoveProducer(producer);
+ safelyRemoveProducer(producer, false);
}
- private void safelyRemoveProducer(Producer producer) {
+ private void safelyRemoveProducer(Producer producer, boolean
keepTombstoneForProducer) {
long producerId = producer.getProducerId();
if (log.isDebugEnabled()) {
log.debug("[{}] Removed producer: producerId={}, producer={}",
remoteAddress, producerId, producer);
}
CompletableFuture<Producer> future = producers.get(producerId);
if (future != null) {
- future.whenComplete((producer2, exception) -> {
+ future.whenCompleteAsync((producer2, exception) -> {
if (exception != null || producer2 == producer) {
producers.remove(producerId, future);
+ if (keepTombstoneForProducer
+ && isActive
+ && getRemoteEndpointProtocolVersion() >=
v5.getValue()) {
+ final long epoch = producer.getEpoch();
+ recentlyClosedProducers.put(producerId, epoch);
+ ctx.executor().schedule(() -> {
+ recentlyClosedProducers.remove(producerId,
epoch);
+ }, service.getKeepAliveIntervalSeconds(),
TimeUnit.SECONDS);
+ }
Review Comment:
Please add a comment that explains this code
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2813,21 +2824,30 @@ public void removedConsumer(Consumer consumer) {
@Override
public void removedProducer(Producer producer) {
- safelyRemoveProducer(producer);
+ safelyRemoveProducer(producer, false);
}
- private void safelyRemoveProducer(Producer producer) {
+ private void safelyRemoveProducer(Producer producer, boolean
keepTombstoneForProducer) {
long producerId = producer.getProducerId();
if (log.isDebugEnabled()) {
log.debug("[{}] Removed producer: producerId={}, producer={}",
remoteAddress, producerId, producer);
}
CompletableFuture<Producer> future = producers.get(producerId);
if (future != null) {
- future.whenComplete((producer2, exception) -> {
+ future.whenCompleteAsync((producer2, exception) -> {
if (exception != null || producer2 == producer) {
producers.remove(producerId, future);
+ if (keepTombstoneForProducer
+ && isActive
+ && getRemoteEndpointProtocolVersion() >=
v5.getValue()) {
Review Comment:
Add a comment that explains the reason for this condition about protocol
version `v5`
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2813,21 +2824,30 @@ public void removedConsumer(Consumer consumer) {
@Override
public void removedProducer(Producer producer) {
- safelyRemoveProducer(producer);
+ safelyRemoveProducer(producer, false);
}
- private void safelyRemoveProducer(Producer producer) {
+ private void safelyRemoveProducer(Producer producer, boolean
keepTombstoneForProducer) {
long producerId = producer.getProducerId();
if (log.isDebugEnabled()) {
log.debug("[{}] Removed producer: producerId={}, producer={}",
remoteAddress, producerId, producer);
}
Review Comment:
Not really a problem in this PR, but this log line isn't accurate since it
happens before anything got removed.
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java:
##########
@@ -2813,21 +2824,30 @@ public void removedConsumer(Consumer consumer) {
@Override
public void removedProducer(Producer producer) {
- safelyRemoveProducer(producer);
+ safelyRemoveProducer(producer, false);
}
- private void safelyRemoveProducer(Producer producer) {
+ private void safelyRemoveProducer(Producer producer, boolean
keepTombstoneForProducer) {
Review Comment:
`keepTombstoneForProducer` could be confusing without any comments. I think
that renaming this will be helpful for readers of the code. Perhaps
`scheduleRemovalFromRecentlyClosedProducers` etc ?
--
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]
