Remove config generation -1/0 from CC at :19050/status/<clustername>/config

3 files changed, 7 insertions, 24 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 10ba907b5a2..ebde8f3a98c 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
@@ -83,8 +83,6 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
     private final StatusPageServer.PatternRequestRouter statusRequestRouter = new StatusPageServer.PatternRequestRouter();
     private final List<ClusterStateBundle> newStates = new ArrayList<>();
     private final List<ClusterStateBundle> convergedStates = new ArrayList<>();
-    private long configGeneration = -1;
-    private long nextConfigGeneration = -1;
     private final Queue<RemoteClusterControllerTask> remoteTasks = new LinkedList<>();
     private final MetricUpdater metricUpdater;
 
@@ -107,8 +105,6 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         @Override
         public FleetControllerOptions getOptions() { return options; }
         @Override
-        public long getConfigGeneration() { return configGeneration; }
-        @Override
         public ContentCluster getCluster() { return cluster; }
     };
 
@@ -153,7 +149,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
                 new LegacyNodePageRequestHandler(timer, eventLog, cluster));
         this.statusRequestRouter.addHandler(
                 "^/state.*",
-                new NodeHealthRequestHandler(dataExtractor));
+                new NodeHealthRequestHandler());
         this.statusRequestRouter.addHandler(
                 "^/clusterstate",
                 new ClusterStateRequestHandler(stateVersionTracker));
@@ -302,13 +298,12 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         nodeLookup.shutdown();
     }
 
-    public void updateOptions(FleetControllerOptions options, long configGeneration) {
+    public void updateOptions(FleetControllerOptions options) {
         var newId = FleetControllerId.fromOptions(options);
         synchronized(monitor) {
             assert newId.equals(context.id());
             context.log(logger, Level.INFO, "FleetController has new options");
             nextOptions = options.clone();
-            nextConfigGeneration = configGeneration;
             monitor.notifyAll();
         }
     }
@@ -551,8 +546,6 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
 
         long currentTime = timer.getCurrentTimeInMillis();
         nextStateSendTime = Math.min(currentTime + options.minTimeBetweenNewSystemStates, nextStateSendTime);
-        configGeneration = nextConfigGeneration;
-        nextConfigGeneration = -1;
     }
 
     private void selfTerminateIfConfiguredNodeIndexHasChanged() {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java
index 39fab92d02c..6a683ce6c04 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java
@@ -9,26 +9,17 @@ import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer
 */
 public class NodeHealthRequestHandler implements StatusPageServer.RequestHandler {
 
-    private final RunDataExtractor data;
-
-    public NodeHealthRequestHandler(RunDataExtractor data) {
-        this.data = data;
-    }
+    public NodeHealthRequestHandler() {}
 
     @Override
     public StatusPageResponse handle(StatusPageServer.HttpRequest request) {
         StatusPageResponse response = new StatusPageResponse();
         response.setContentType("application/json");
         response.writeContent("{\n" +
-                          "  \"status\" : {\n" +
-                          "    \"code\" : \"up\"\n" +
-                          "  },\n" +
-                          "  \"config\" : {\n" +
-                          "    \"component\" : {\n" +
-                          "      \"generation\" : " + data.getConfigGeneration() + "\n" +
-                          "    }\n" +
-                          "  }\n" +
-                          "}");
+                              "  \"status\" : {\n" +
+                              "    \"code\" : \"up\"\n" +
+                              "  }\n" +
+                              "}");
         return response;
     }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java
index ee2b74372ae..599931ba13c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java
@@ -10,7 +10,6 @@ import com.yahoo.vespa.clustercontroller.core.FleetControllerOptions;
 public interface RunDataExtractor {
 
     FleetControllerOptions getOptions();
-    long getConfigGeneration();
     ContentCluster getCluster();
 
 }