Skip to content

Commit e1196d1

Browse files
committed
remove isTimeBacklogExceeded
1 parent 50191b0 commit e1196d1

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,14 +1715,22 @@ public synchronized void monitorBacklogQuota() {
17151715
if (persistentTopic.isSizeBacklogExceeded()) {
17161716
getBacklogQuotaManager().handleExceededBacklogQuota(persistentTopic,
17171717
BacklogQuota.BacklogQuotaType.destination_storage, false);
1718-
} else if (persistentTopic.isTimeBacklogExceeded()) {
1719-
getBacklogQuotaManager().handleExceededBacklogQuota(persistentTopic,
1720-
BacklogQuota.BacklogQuotaType.message_age,
1721-
pulsar.getConfiguration().isPreciseTimeBasedBacklogQuotaCheck());
17221718
} else {
1723-
if (log.isDebugEnabled()) {
1724-
log.debug("quota not exceeded for [{}]", topic.getName());
1725-
}
1719+
persistentTopic.checkTimeBacklogExceeded().thenAccept(isExceeded -> {
1720+
if (isExceeded) {
1721+
getBacklogQuotaManager().handleExceededBacklogQuota(persistentTopic,
1722+
BacklogQuota.BacklogQuotaType.message_age,
1723+
pulsar.getConfiguration().isPreciseTimeBasedBacklogQuotaCheck());
1724+
} else {
1725+
if (log.isDebugEnabled()) {
1726+
log.debug("quota not exceeded for [{}]", topic.getName());
1727+
}
1728+
}
1729+
}).exceptionally(throwable -> {
1730+
log.error("Error when checkTimeBacklogExceeded({}) in monitorBacklogQuota",
1731+
persistentTopic.getName(), throwable);
1732+
return null;
1733+
});
17261734
}
17271735
}
17281736
});

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,15 +2561,6 @@ public boolean isSizeBacklogExceeded() {
25612561
/**
25622562
* @return determine if backlog quota enforcement needs to be done for topic based on time limit
25632563
*/
2564-
public boolean isTimeBacklogExceeded() {
2565-
try {
2566-
return checkTimeBacklogExceeded().get();
2567-
} catch (Throwable e) {
2568-
log.error("[{}] checkTimeBacklogExceeded failed.", topic, e);
2569-
return false;
2570-
}
2571-
}
2572-
25732564
public CompletableFuture<Boolean> checkTimeBacklogExceeded() {
25742565
TopicName topicName = TopicName.get(getName());
25752566
int backlogQuotaLimitInSecond = getBacklogQuota(BacklogQuotaType.message_age).getLimitTime();

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public boolean isSizeBacklogExceeded() {
3636
}
3737

3838
@Override
39-
public boolean isTimeBacklogExceeded() {
40-
return false;
39+
public CompletableFuture<Boolean> checkTimeBacklogExceeded() {
40+
return CompletableFuture.completedFuture(false);
4141
}
4242

4343
@Override

0 commit comments

Comments
 (0)