diff options
2 files changed, 2 insertions, 23 deletions
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 6666066422a..6c543401502 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 @@ -21,9 +21,6 @@ import java.util.TreeSet; */ public class FleetControllerOptions { - private final String fleetControllerConfigId; - private final String slobrokConfigId; - private final String clusterName; private final int fleetControllerIndex; private final int fleetControllerCount; @@ -134,9 +131,7 @@ public class FleetControllerOptions { private final double clusterFeedBlockNoiseLevel; - private FleetControllerOptions(String fleetControllerConfigId, - String slobrokConfigId, - String clusterName, + private FleetControllerOptions(String clusterName, int fleetControllerIndex, int fleetControllerCount, int stateGatherCount, @@ -179,8 +174,6 @@ public class FleetControllerOptions { boolean clusterFeedBlockEnabled, Map<String, Double> clusterFeedBlockLimit, double clusterFeedBlockNoiseLevel) { - this.fleetControllerConfigId = fleetControllerConfigId; - this.slobrokConfigId = slobrokConfigId; this.clusterName = clusterName; this.fleetControllerIndex = fleetControllerIndex; this.fleetControllerCount = fleetControllerCount; @@ -234,12 +227,6 @@ public class FleetControllerOptions { return maxTransitionTime.getOrDefault(NodeType.STORAGE, 10_000); } - public String fleetControllerConfigId() {return fleetControllerConfigId;} - - public String slobrokConfigId() { - return slobrokConfigId; - } - public String clusterName() { return clusterName; } @@ -414,8 +401,6 @@ public class FleetControllerOptions { public static class Builder { - private String fleetControllerConfigId; - private String slobrokConfigId; private String clusterName; private int index = 0; private int count = 1; @@ -725,9 +710,7 @@ public class FleetControllerOptions { } public FleetControllerOptions build() { - return new FleetControllerOptions(fleetControllerConfigId, - slobrokConfigId, - clusterName, + return new FleetControllerOptions(clusterName, index, count, stateGatherCount, @@ -774,8 +757,6 @@ public class FleetControllerOptions { public static Builder copy(FleetControllerOptions options) { Builder builder = new Builder(options.clusterName(), options.nodes()); - builder.fleetControllerConfigId = options.fleetControllerConfigId; - builder.slobrokConfigId = options.slobrokConfigId; builder.clusterName = options.clusterName; builder.index = options.fleetControllerIndex; builder.count = options.fleetControllerCount; 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 a7ec2ddaa8f..32b6cf47b87 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 @@ -212,8 +212,6 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa slobrokspecs += options.slobrokConnectionSpecs()[i]; } sb.append("<h1>Current config</h1>\n") - .append("<p>Fleet controller config id: ").append(options.fleetControllerConfigId() == null ? null : options.fleetControllerConfigId().replaceAll("\n", "<br>\n")).append("</p>\n") - .append("<p>Slobrok config id: ").append(options.slobrokConfigId() == null ? null : options.slobrokConfigId().replaceAll("\n", "<br>\n")).append("</p>\n") .append("<table border=\"1\" cellspacing=\"0\"><tr><th>Property</th><th>Value</th></tr>\n"); sb.append("<tr><td><nobr>Cluster name</nobr></td><td align=\"right\">").append(options.clusterName()).append("</td></tr>"); |