You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2019/12/30 02:13:50 UTC
[pulsar-manager] branch master updated: Fixed display stats for
tenant and namespace (#243)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git
The following commit(s) were added to refs/heads/master by this push:
new 3b3741d Fixed display stats for tenant and namespace (#243)
3b3741d is described below
commit 3b3741d39f8da1bfcf4f7ea6a08923a38c280f8d
Author: Guangning <gu...@apache.org>
AuthorDate: Mon Dec 30 10:13:44 2019 +0800
Fixed display stats for tenant and namespace (#243)
### Motivation
At present, because TopicStatsEntity did not get the correct tenant, the stats information display for tenants and namespaces lacks some information. This pr fixes this problem.
### Modifications
* Use the correct tenant and namespace.
---
.../pulsar/manager/service/impl/NamespacesServiceImpl.java | 11 ++++++++---
.../pulsar/manager/service/impl/TenantsServiceImpl.java | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/pulsar/manager/service/impl/NamespacesServiceImpl.java b/src/main/java/org/apache/pulsar/manager/service/impl/NamespacesServiceImpl.java
index e6a51d8..e96517c 100644
--- a/src/main/java/org/apache/pulsar/manager/service/impl/NamespacesServiceImpl.java
+++ b/src/main/java/org/apache/pulsar/manager/service/impl/NamespacesServiceImpl.java
@@ -76,13 +76,18 @@ public class NamespacesServiceImpl implements NamespacesService {
TopicStatsEntity topicStatsEntity = topicStatsEntityOptional.get();
String environment = request.getHeader("environment");
ArrayList<String> namespaceList = new ArrayList<>();
- namespaceList.add(topicStatsEntity.getNamespace());
+ for (String namespace : namespacesList) {
+ String[] path = namespace.split("/");
+ if (path.length > 1) {
+ namespaceList.add(path[1]);
+ }
+ }
Page<TopicStatsEntity> namespaceCountPage = brokerStatsService.findByMultiNamespace(
- 1, 1, environment, topicStatsEntity.getTenant(),
+ 1, 1, environment, tenant,
namespaceList, topicStatsEntity.getTimestamp());
namespaceCountPage.count(true);
Page<TopicStatsEntity> namespaceAllCountPage = brokerStatsService.findByMultiNamespace(
- 1, (int)namespaceCountPage.getTotal(), environment, topicStatsEntity.getTenant(),
+ 1, (int)namespaceCountPage.getTotal(), environment, tenant,
namespaceList, topicStatsEntity.getTimestamp());
for (TopicStatsEntity statsEntity : namespaceAllCountPage) {
topicStatsEntityMap.put(statsEntity.getNamespace(), statsEntity);
diff --git a/src/main/java/org/apache/pulsar/manager/service/impl/TenantsServiceImpl.java b/src/main/java/org/apache/pulsar/manager/service/impl/TenantsServiceImpl.java
index 6a3c93a..2f61880 100644
--- a/src/main/java/org/apache/pulsar/manager/service/impl/TenantsServiceImpl.java
+++ b/src/main/java/org/apache/pulsar/manager/service/impl/TenantsServiceImpl.java
@@ -83,7 +83,7 @@ public class TenantsServiceImpl implements TenantsService {
Page<TopicStatsEntity> tenantAllCountPage = brokerStatsService.findByMultiTenant(1,
(int)tenantCountPage.getTotal(), environment, tenantsList, topicStatsEntity.getTimestamp());
for (TopicStatsEntity statsEntity : tenantAllCountPage) {
- topicStatsEntityMap.put(topicStatsEntity.getTenant(), statsEntity);
+ topicStatsEntityMap.put(statsEntity.getTenant(), statsEntity);
}
}
for (String tenant : tenantsList) {