sijie commented on a change in pull request #9561:
URL: https://github.com/apache/pulsar/pull/9561#discussion_r574325461
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
##########
@@ -3036,18 +3036,32 @@ private void
internalExpireMessagesByTimestampForSinglePartition(String subName,
PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
try {
+ boolean issued;
if (subName.startsWith(topic.getReplicatorPrefix())) {
String remoteCluster =
PersistentReplicator.getRemoteCluster(subName);
PersistentReplicator repl = (PersistentReplicator)
topic.getPersistentReplicator(remoteCluster);
checkNotNull(repl);
- repl.expireMessages(expireTimeInSeconds);
+ issued = repl.expireMessages(expireTimeInSeconds);
} else {
PersistentSubscription sub = topic.getSubscription(subName);
checkNotNull(sub);
- sub.expireMessages(expireTimeInSeconds);
+ issued = sub.expireMessages(expireTimeInSeconds);
+ }
+ if (issued) {
+ log.info("[{}] Message expire started up to {} on {} {}",
clientAppId(), expireTimeInSeconds, topicName,
+ subName);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.info("Expire message by timestamp not issued on topic
{} for subscription {} due to ongoing "
Review comment:
why using `log.info` in a `log.isDebugEnabled` block?
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
##########
@@ -3105,19 +3119,31 @@ protected void
internalExpireMessagesByPosition(AsyncResponse asyncResponse, Str
getEntryBatchSize(batchSizeFuture, topic, messageId,
batchIndex);
batchSizeFuture.thenAccept(bi -> {
PositionImpl position =
calculatePositionAckSet(isExcluded, bi, batchIndex, messageId);
+ boolean issued;
try {
if (subName.startsWith(topic.getReplicatorPrefix())) {
String remoteCluster =
PersistentReplicator.getRemoteCluster(subName);
PersistentReplicator repl = (PersistentReplicator)
topic.getPersistentReplicator(remoteCluster);
checkNotNull(repl);
- repl.expireMessages(position);
+ issued = repl.expireMessages(position);
} else {
checkNotNull(sub);
- sub.expireMessages(position);
+ issued = sub.expireMessages(position);
+ }
+ if (issued) {
+ log.info("[{}] Message expire started up to {} on
{} {}", clientAppId(), position,
+ topicName, subName);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.info("Expire message by position not
issued on topic {} for subscription {} "
Review comment:
ditto
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
