You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by rx...@apache.org on 2020/10/27 10:26:02 UTC
[pulsar] branch branch-2.6 updated: [Release 2.6.2] Resolve pr 7766
conflict
This is an automated email from the ASF dual-hosted git repository.
rxl pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new e12b33f [Release 2.6.2] Resolve pr 7766 conflict
e12b33f is described below
commit e12b33ff99ec384fd14417f552bae0c602e9ddd3
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Thu Aug 6 01:57:49 2020 -0700
[Release 2.6.2] Resolve pr 7766 conflict
Signed-off-by: xiaolong.ran <rx...@apache.org>
---
.../src/main/java/org/apache/pulsar/proxy/server/ProxyService.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
index 8437a64..e9e46ca 100644
--- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
+++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java
@@ -142,8 +142,11 @@ public class ProxyService implements Closeable {
.newSingleThreadScheduledExecutor(new DefaultThreadFactory("proxy-stats-executor"));
statsExecutor.schedule(()->{
this.clientCnxs.forEach(cnx -> {
- cnx.getDirectProxyHandler().getInboundChannelRequestsRate().calculateRate();
- });
+ if (cnx.getDirectProxyHandler() != null
+ && cnx.getDirectProxyHandler().getInboundChannelRequestsRate() != null) {
+ cnx.getDirectProxyHandler().getInboundChannelRequestsRate().calculateRate();
+ }
+ });
this.topicStats.forEach((topic, stats) -> {
stats.calculate();
});