From e146696c60188ea622a0122338f1ad7d26f880c7 Mon Sep 17 00:00:00 2001 From: Rajan Date: Thu, 1 Jun 2017 00:15:04 -0700 Subject: [PATCH] add log and cleanup failed non-durable subscription (#444) --- .../org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 4 +--- .../pulsar/broker/service/persistent/PersistentTopic.java | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java index 8d4171d8704..1b6bd1ac57d 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java @@ -1595,9 +1595,7 @@ public class ManagedCursorImpl implements ManagedCursor { PositionImpl newReadPosition = ledger.getNextValidPosition(markDeletePosition); PositionImpl oldReadPosition = readPosition; - if (log.isDebugEnabled()) { - log.debug("Rewind from {} to {}", oldReadPosition, newReadPosition); - } + log.info("[{}] Rewind from {} to {}", name, oldReadPosition, newReadPosition); readPosition = newReadPosition; } finally { diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentTopic.java index 5aecb7f3def..d8fac818e7e 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentTopic.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentTopic.java @@ -446,6 +446,9 @@ public class PersistentTopic implements Topic, AddEntryCallback { if (!subscriptionFuture.isDone()) { subscriptionFuture.complete(subscription); + } else { + // failed to initialize managed-cursor: clean up created subscription + subscriptions.remove(subscriptionName); } return subscriptionFuture; -- GitLab