From 063e9e802e93001667ca8a136ce24fbb6f7e7fd0 Mon Sep 17 00:00:00 2001
From: gaoran10 <gaoran_10@126.com>
Date: Tue, 31 Aug 2021 17:46:38 +0800
Subject: [PATCH 1/4] It didn't need to print the warning error stack.
---
.../apache/pulsar/broker/service/BacklogQuotaManager.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 91a03f627d40d..27262c41b32e9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -91,9 +91,12 @@ public BacklogQuotaImpl getBacklogQuota(TopicName topicName, BacklogQuotaType ba
.map(TopicPolicies::getBackLogQuotaMap)
.map(map -> map.get(backlogQuotaType.name()))
.orElseGet(() -> getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType));
- } catch (Exception e) {
+ } catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
log.warn("Failed to read topic policies data, will apply the namespace backlog quota: topicName={}",
- topicName, e);
+ topicName);
+ } catch (Exception e) {
+ log.error("Encounter error when reading topic policies data,"
+ + "will apply the namespace backlog quota: topicName={}", topicName, e);
}
return getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType);
}
From 9afa240c36f4b2f19df2f820b52cfae1c08ae4e6 Mon Sep 17 00:00:00 2001
From: gaoran10 <gaoran_10@126.com>
Date: Tue, 31 Aug 2021 17:47:46 +0800
Subject: [PATCH 2/4] fix
---
.../org/apache/pulsar/broker/service/BacklogQuotaManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 27262c41b32e9..15a58606be65a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -92,10 +92,10 @@ public BacklogQuotaImpl getBacklogQuota(TopicName topicName, BacklogQuotaType ba
.map(map -> map.get(backlogQuotaType.name()))
.orElseGet(() -> getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType));
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Failed to read topic policies data, will apply the namespace backlog quota: topicName={}",
+ log.warn("Topic policies cache have not init, will apply the namespace backlog quota: topicName={}",
topicName);
} catch (Exception e) {
- log.error("Encounter error when reading topic policies data,"
+ log.error("Failed to read topic policies data,"
+ "will apply the namespace backlog quota: topicName={}", topicName, e);
}
return getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType);
From c18bc5f7226adb6478461bd56b898019c8e3f197 Mon Sep 17 00:00:00 2001
From: gaoran10 <gaoran_10@126.com>
Date: Wed, 1 Sep 2021 10:19:53 +0800
Subject: [PATCH 3/4] change log level to debug
---
.../org/apache/pulsar/broker/service/BacklogQuotaManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 15a58606be65a..70399ce97ac67 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -92,7 +92,7 @@ public BacklogQuotaImpl getBacklogQuota(TopicName topicName, BacklogQuotaType ba
.map(map -> map.get(backlogQuotaType.name()))
.orElseGet(() -> getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType));
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic policies cache have not init, will apply the namespace backlog quota: topicName={}",
+ log.debug("Topic policies cache have not init, will apply the namespace backlog quota: topicName={}",
topicName);
} catch (Exception e) {
log.error("Failed to read topic policies data,"
From f605ccdad43d9a9c901840927809dd70120544a1 Mon Sep 17 00:00:00 2001
From: lipenghui <penghui@apache.org>
Date: Wed, 1 Sep 2021 18:22:25 +0800
Subject: [PATCH 4/4] Update
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
Co-authored-by: Michael Marshall <mikemarsh17@gmail.com>
---
.../org/apache/pulsar/broker/service/BacklogQuotaManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 70399ce97ac67..87ee912173430 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -95,7 +95,7 @@ public BacklogQuotaImpl getBacklogQuota(TopicName topicName, BacklogQuotaType ba
log.debug("Topic policies cache have not init, will apply the namespace backlog quota: topicName={}",
topicName);
} catch (Exception e) {
- log.error("Failed to read topic policies data,"
+ log.error("Failed to read topic policies data, "
+ "will apply the namespace backlog quota: topicName={}", topicName, e);
}
return getBacklogQuota(topicName.getNamespace(), policyPath, backlogQuotaType);