This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 907fcb5 change log level for topic polices cache not init exception
(#10059)
907fcb5 is described below
commit 907fcb5ba81dcc4878da395d6387eb534bb04562
Author: hangc0276 <[email protected]>
AuthorDate: Mon Mar 29 22:27:14 2021 +0800
change log level for topic polices cache not init exception (#10059)
---
.../apache/pulsar/broker/admin/AdminResource.java | 2 +-
.../broker/admin/impl/PersistentTopicsBase.java | 26 +++++++++++-----------
.../pulsar/broker/service/AbstractTopic.java | 4 ++--
.../pulsar/broker/service/BrokerService.java | 6 ++---
.../service/persistent/DispatchRateLimiter.java | 2 +-
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
index c394bba..063120b 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -403,7 +403,7 @@ public abstract class AdminResource extends
PulsarWebResource {
} catch (RestException re) {
throw re;
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e){
- log.error("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
throw new RestException(e);
} catch (Exception e) {
log.error("[{}] Failed to get topic policies {}", clientAppId(),
topicName, e);
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 455cee1..7000e08 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -565,7 +565,7 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
asyncResponse.resume(new RestException(e));
return;
}
@@ -829,8 +829,8 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
- throw new RestException(Status.PRECONDITION_FAILED, "Policies
cache have not init");
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
+ throw new RestException(Status.PRECONDITION_FAILED, "Policies have
not been initialized yet");
}
if (topicPolicies == null) {
topicPolicies = new TopicPolicies();
@@ -883,9 +883,9 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
return FutureUtil.failedFuture(new
RestException(Status.PRECONDITION_FAILED,
- "Policies cache have not init"));
+ "Policies have not been initialized yet"));
}
if (topicPolicies == null) {
topicPolicies = new TopicPolicies();
@@ -947,8 +947,8 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
- throw new RestException(Status.PRECONDITION_FAILED, "Policies
cache have not init");
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
+ throw new RestException(Status.PRECONDITION_FAILED, "Policies have
not been initialized yet");
}
if (topicPolicies == null) {
topicPolicies = new TopicPolicies();
@@ -980,9 +980,9 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
return FutureUtil.failedFuture(new
RestException(Status.PRECONDITION_FAILED,
- "Policies cache have not init"));
+ "Policies have not been initialized yet"));
}
if (topicPolicies == null) {
topicPolicies = new TopicPolicies();
@@ -2561,7 +2561,7 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
asyncResponse.resume(new RestException(e));
return;
}
@@ -2622,8 +2622,8 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.error("Topic {} policies cache have not init.", topicName);
- throw new RestException(Status.PRECONDITION_FAILED, "Policies
cache have not init");
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
+ throw new RestException(Status.PRECONDITION_FAILED, "Policies have
not been initialized yet");
}
if (topicPolicies == null) {
topicPolicies = new TopicPolicies();
@@ -2642,7 +2642,7 @@ public class PersistentTopicsBase extends AdminResource {
try {
topicPolicies =
pulsar().getTopicPoliciesService().getTopicPolicies(topicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic {} policies cache have not init.", topicName);
+ log.error("Topic {} policies have not been initialized yet.",
topicName);
asyncResponse.resume(new RestException(e));
return;
}
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
index 61d4bc7..20a97f5 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -806,10 +806,10 @@ public abstract class AbstractTopic implements Topic {
try {
return
brokerService.pulsar().getTopicPoliciesService().getTopicPolicies(cloneTopicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic {} policies cache have not init.",
topicName.getPartitionedTopicName());
+ log.debug("Topic {} policies have not been initialized yet.",
topicName.getPartitionedTopicName());
return null;
} catch (NullPointerException e) {
- log.warn("Topic level policies are not enabled. "
+ log.debug("Topic level policies are not enabled. "
+ "Please refer to systemTopicEnabled and
topicLevelPoliciesEnabled on broker.conf");
return null;
}
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index e98978d..2af76e9 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1259,7 +1259,7 @@ public class BrokerService implements Closeable,
ZooKeeperCacheListener<Policies
topicLevelOffloadPolicies =
topicPolicies.getOffloadPolicies();
}
} catch
(BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic {} policies cache have not init.",
topicName);
+ log.debug("Topic {} policies have not been initialized
yet.", topicName);
}
}
@@ -2565,10 +2565,10 @@ public class BrokerService implements Closeable,
ZooKeeperCacheListener<Policies
checkTopicLevelPolicyEnable();
return
pulsar.getTopicPoliciesService().getTopicPolicies(cloneTopicName);
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException e) {
- log.warn("Topic {} policies cache have not init.",
topicName.getPartitionedTopicName());
+ log.debug("Topic {} policies have not been initialized yet.",
topicName.getPartitionedTopicName());
return null;
} catch (RestException | NullPointerException e) {
- log.warn("Topic level policies are not enabled. "
+ log.debug("Topic level policies are not enabled. "
+ "Please refer to systemTopicEnabled and
topicLevelPoliciesEnabled on broker.conf");
return null;
}
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
index 285d587..6addacf 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
@@ -199,7 +199,7 @@ public class DispatchRateLimiter {
break;
}
} catch (BrokerServiceException.TopicPoliciesCacheNotInitException
e) {
- log.debug("Topic {} policies cache have not init.", topicName);
+ log.debug("Topic {} policies have not been initialized yet.",
topicName);
} catch (Exception e) {
log.debug("[{}] Failed to get topic dispatch rate. ",
topicName, e);
}
