summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@verizonmedia.com>2021-03-12 15:09:21 +0100
committerTor Brede Vekterli <vekterli@verizonmedia.com>2021-03-12 15:09:21 +0100
commit16870d8a714f6fd3afa9b10d88fa740ad5be9872 (patch)
tree88bbdb06364f305cde5c41cb147f18e5e9c48749
parent0a78220415f590da91e4710d38c52c42a0f7572c (diff)
Move ZK/election-related info away from top of CC status page
Much less immediately interesting than the actual cluster node information. Move it just above the general event log instead.
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
index 2813280add2..a64aad3d5be 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
@@ -57,8 +57,6 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
content.append("<table><tr><td>UTC time when creating this page:</td><td align=\"right\">").append(RealTimer.printDateNoMilliSeconds(currentTime, tz)).append("</td></tr>");
//content.append("<tr><td>Fleetcontroller version:</td><td align=\"right\">" + Vtag.V_TAG_PKG + "</td></tr/>");
content.append("<tr><td>Cluster controller uptime:</td><td align=\"right\">" + RealTimer.printDuration(currentTime - startedTime) + "</td></tr></table>");
- // State of master election
- masterElectionHandler.writeHtmlState(content, data.getOptions().stateGatherCount);
if (masterElectionHandler.isAmongNthFirst(data.getOptions().stateGatherCount)) {
// Table overview of all the nodes
cluster.writeHtmlState(
@@ -79,6 +77,8 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
// Overview of current config
data.getOptions().writeHtmlState(content);
}
+ // State of master election
+ masterElectionHandler.writeHtmlState(content, data.getOptions().stateGatherCount);
// Event log
eventLog.writeHtmlState(content, null);
response.writeHtmlFooter(content, "");