This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 6147c1c HBASE-26000 Optimize the display of ZK dump in the master web
UI (#3383)
6147c1c is described below
commit 6147c1cfaeda75b56f16114fdb0e89602c99463b
Author: litao <[email protected]>
AuthorDate: Tue Jun 15 21:10:55 2021 +0800
HBASE-26000 Optimize the display of ZK dump in the master web UI (#3383)
Signed-off-by: Wellington Chevreuil <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 555f8b461ff432c1ad2bc79bffc9b3b49833b1f8)
---
.../main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
index 981265e..80d9f41 100644
---
a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
+++
b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
@@ -1846,7 +1846,7 @@ public final class ZKUtil {
sb.append("HBase is rooted at ").append(zkw.getZNodePaths().baseZNode);
sb.append("\nActive master address: ");
try {
- sb.append(MasterAddressTracker.getMasterAddress(zkw));
+ sb.append("\n ").append(MasterAddressTracker.getMasterAddress(zkw));
} catch (IOException e) {
sb.append("<<FAILED LOOKUP: " + e.getMessage() + ">>");
}
@@ -1858,14 +1858,14 @@ public final class ZKUtil {
sb.append("\n ").append(child);
}
}
- sb.append("\nRegion server holding hbase:meta: "
- + MetaTableLocator.getMetaRegionLocation(zkw));
+ sb.append("\nRegion server holding hbase:meta:");
+ sb.append("\n ").append(MetaTableLocator.getMetaRegionLocation(zkw));
Configuration conf = HBaseConfiguration.create();
int numMetaReplicas = conf.getInt(HConstants.META_REPLICAS_NUM,
HConstants.DEFAULT_META_REPLICA_NUM);
for (int i = 1; i < numMetaReplicas; i++) {
- sb.append("\nRegion server holding hbase:meta, replicaId " + i + " "
- + MetaTableLocator.getMetaRegionLocation(zkw, i));
+ sb.append("\n replica" + i + ": "
+ + MetaTableLocator.getMetaRegionLocation(zkw, i));
}
sb.append("\nRegion servers:");
final List<String> rsChildrenNoWatchList =