diff options
Diffstat (limited to 'clustercontroller-core/src/main/java')
4 files changed, 6 insertions, 22 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index 6876ac8cf56..42460b5943e 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -561,7 +561,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta if ( ! isRunning()) { return; } - if (masterElectionHandler.isAmongNthFirst(options.stateGatherCount())) { + if (masterElectionHandler.isFirstInLine()) { didWork |= resyncLocallyCachedState(); // Calls to metricUpdate.forWork inside method } else { stepDownAsStateGatherer(); diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java index 1541e1a4218..bac6a838300 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java @@ -24,7 +24,6 @@ public class FleetControllerOptions { private final String clusterName; private final int fleetControllerIndex; private final int fleetControllerCount; - private final int stateGatherCount; private final String[] slobrokConnectionSpecs; private final int rpcPort; @@ -132,7 +131,6 @@ public class FleetControllerOptions { private FleetControllerOptions(String clusterName, int fleetControllerIndex, int fleetControllerCount, - int stateGatherCount, String[] slobrokConnectionSpecs, int rpcPort, int httpPort, @@ -174,7 +172,6 @@ public class FleetControllerOptions { this.clusterName = clusterName; this.fleetControllerIndex = fleetControllerIndex; this.fleetControllerCount = fleetControllerCount; - this.stateGatherCount = stateGatherCount; this.slobrokConnectionSpecs = slobrokConnectionSpecs; this.rpcPort = rpcPort; this.httpPort = httpPort; @@ -235,10 +232,6 @@ public class FleetControllerOptions { return fleetControllerCount; } - public int stateGatherCount() { - return stateGatherCount; - } - public String[] slobrokConnectionSpecs() { return slobrokConnectionSpecs; } @@ -394,7 +387,6 @@ public class FleetControllerOptions { private String clusterName; private int index = 0; private int count = 1; - private int stateGatherCount = 2; private String[] slobrokConnectionSpecs; private int rpcPort = 0; private int httpPort = 0; @@ -464,11 +456,6 @@ public class FleetControllerOptions { return this; } - public Builder setStateGatherCount(int stateGatherCount) { - this.stateGatherCount = stateGatherCount; - return this; - } - public Builder setSlobrokConnectionSpecs(String[] slobrokConnectionSpecs) { Objects.requireNonNull(slobrokConnectionSpecs, "slobrokConnectionSpecs cannot be null"); this.slobrokConnectionSpecs = slobrokConnectionSpecs; @@ -694,7 +681,6 @@ public class FleetControllerOptions { return new FleetControllerOptions(clusterName, index, count, - stateGatherCount, slobrokConnectionSpecs, rpcPort, httpPort, @@ -740,7 +726,6 @@ public class FleetControllerOptions { builder.clusterName = options.clusterName; builder.index = options.fleetControllerIndex; builder.count = options.fleetControllerCount; - builder.stateGatherCount = options.stateGatherCount; builder.slobrokConnectionSpecs = options.slobrokConnectionSpecs; builder.rpcPort = options.rpcPort; builder.httpPort = options.httpPort; diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java index b041e6b14f8..fa303533355 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java @@ -118,7 +118,7 @@ public class MasterElectionHandler implements MasterInterface { return 2 * followers <= totalCount; } - public boolean isAmongNthFirst(int first) { return (nextInLineCount < first); } + public boolean isFirstInLine() { return (nextInLineCount < 1); } public boolean watchMasterElection(DatabaseHandler database, DatabaseHandler.DatabaseContext dbContext) { if (totalCount == 1 && !usingZooKeeper) { @@ -251,7 +251,7 @@ public class MasterElectionHandler implements MasterInterface { nextMasterData = null; } - public void writeHtmlState(StringBuilder sb, int stateGatherCount) { + public void writeHtmlState(StringBuilder sb) { sb.append("<h2>Master state</h2>\n"); Integer master = getMaster(); if (master != null) { @@ -270,7 +270,7 @@ public class MasterElectionHandler implements MasterInterface { .append(" before electing new master unless all possible master candidates are online.</p>"); } } - if ((master == null || master != index) && nextInLineCount < stateGatherCount) { + if ((master == null || master != index) && nextInLineCount < 1) { sb.append("<p>As we are number ").append(nextInLineCount) .append(" in line for taking over as master, we're gathering state from nodes.</p>"); sb.append("<p><font color=\"red\">As we are not the master, we don't know about nodes current system state" 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 3297d511469..5aae401e157 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 @@ -81,7 +81,7 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa .append(" ]</font></p>\n"); 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>Cluster controller uptime:</td><td align=\"right\">" + RealTimer.printDuration(currentTime - startedTime) + "</td></tr></table>"); - if (masterElectionHandler.isAmongNthFirst(options.stateGatherCount())) { + if (masterElectionHandler.isFirstInLine()) { // Table overview of all the nodes writeHtmlState(cluster, content, timer, stateVersionTracker, options, eventLog); // Current cluster state and cluster state history @@ -91,7 +91,7 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa writeHtmlState(content, options); } // State of master election - masterElectionHandler.writeHtmlState(content, options.stateGatherCount()); + masterElectionHandler.writeHtmlState(content); // Overview of current config writeHtmlState(content, options); // Event log @@ -223,7 +223,6 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa sb.append("<tr><td><nobr>Cluster name</nobr></td><td align=\"right\">").append(options.clusterName()).append("</td></tr>"); sb.append("<tr><td><nobr>Fleet controller index</nobr></td><td align=\"right\">").append(options.fleetControllerIndex()).append("/").append(options.fleetControllerCount()).append("</td></tr>"); - sb.append("<tr><td><nobr>Number of fleetcontrollers gathering states from nodes</nobr></td><td align=\"right\">").append(options.stateGatherCount()).append("</td></tr>"); sb.append("<tr><td><nobr>Slobrok connection spec</nobr></td><td align=\"right\">").append(slobrokspecs).append("</td></tr>"); sb.append("<tr><td><nobr>RPC port</nobr></td><td align=\"right\">").append(options.rpcPort() == 0 ? "Pick random available" : options.rpcPort()).append("</td></tr>"); |