From 9c383fae9f7ce274d9bd235795afda8dd61ba857 Mon Sep 17 00:00:00 2001 From: Sakthi Date: Thu, 24 Jan 2019 19:28:03 -0800 Subject: [PATCH] HBASE-21771: Cluster key in Master UI is incorrect --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index da44052dee78dde2a826e17b901692d0473ddcc7..a4f38ce94e233241fb23b80939f0016482388417 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -72,7 +72,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <%class> - public String formatZKString() { + public String formatZKString(boolean includePorts) { StringBuilder quorums = new StringBuilder(); String zkQuorum = master.getZooKeeper().getQuorum(); @@ -86,11 +86,19 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); return quorums.toString(); } - for(int i = 0; i < zks.length; ++i) { - quorums.append(zks[i].trim()); + String delimiter = includePorts ? "
" : ","; + + for (int i = 0; i < zks.length; ++i) { + zks[i] = zks[i].trim(); + + if (!includePorts && i != (zks.length - 1)) { + zks[i] = zks[i].split(":")[0]; + } + + quorums.append(zks[i]); if (i != (zks.length - 1)) { - quorums.append("
"); + quorums.append(delimiter); } } @@ -283,7 +291,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();

Software Attributes

- +
@@ -331,7 +339,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <%escape #n> - + @@ -341,7 +349,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); - + -- 2.17.2 (Apple Git-113)
Attribute Name Value
ZooKeeper Quorum <% formatZKString() %> <% formatZKString(true) %> Addresses of all registered ZK servers. For more, see zk dump.
Cluster Key <% formatZKString() %>:<% master.getZooKeeper().getZNodePaths().baseZNode %> <% formatZKString(false) %>:<% master.getZooKeeper().getZNodePaths().baseZNode %> Key to add this cluster as a peer for replication. Use 'help "add_peer"' in the shell for details.