Remove debug info

6 files changed, 1 insertions, 59 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
index 16992bcb13a..37d79d97e74 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdmin.java
@@ -5,7 +5,6 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 
 import java.time.Duration;
 import java.util.List;
-import java.util.Map;
 
 /**
  * NodeAdmin manages the life cycle of NodeAgents.
@@ -47,12 +46,6 @@ public interface NodeAdmin {
     void stopNodeAgentServices(List<String> nodes);
 
     /**
-     * Returns a map containing all relevant NodeAdmin variables and their current values.
-     * Do not try to parse output or use in tests.
-     */
-    Map<String, Object> debugInfo();
-
-    /**
      * Start node-admin schedulers.
      */
     void start();
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index b1c1a99a90a..f8114a68d07 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -15,7 +15,6 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -143,21 +142,6 @@ public class NodeAdminImpl implements NodeAdmin {
                 });
     }
 
-    public int getNumberOfNodeAgents() {
-        return nodeAgentsByHostname.keySet().size();
-    }
-
-    @Override
-    public Map<String, Object> debugInfo() {
-        Map<String, Object> debug = new LinkedHashMap<>();
-        debug.put("isFrozen", isFrozen);
-
-        List<Map<String, Object>> nodeAgentDebugs = nodeAgentsByHostname.values().stream()
-                .map(NodeAgent::debugInfo).collect(Collectors.toList());
-        debug.put("NodeAgents", nodeAgentDebugs);
-        return debug;
-    }
-
     @Override
     public void start() {
         metricsScheduler.scheduleAtFixedRate(() -> {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java
index 296745c8e37..39efee7d772 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImpl.java
@@ -15,9 +15,7 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
@@ -82,18 +80,6 @@ public class NodeAdminStateUpdaterImpl implements NodeAdminStateUpdater {
     }
 
     @Override
-    public Map<String, Object> getDebugPage() {
-        Map<String, Object> debug = new LinkedHashMap<>();
-        synchronized (monitor) {
-            debug.put("hostHostname", hostHostname);
-            debug.put("wantedState", wantedState);
-            debug.put("currentState", currentState);
-            debug.put("NodeAdmin", nodeAdmin.debugInfo());
-        }
-        return debug;
-    }
-
-    @Override
     public void setResumeStateAndCheckIfResumed(State wantedState) {
         synchronized (monitor) {
             if (this.wantedState != wantedState) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgent.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgent.java
index 7c789e10d19..947e7c85d66 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgent.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgent.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.nodeagent;
 
-import java.util.Map;
-
 /**
  * Responsible for management of a single node over its lifecycle.
  * May own its own resources, threads etc. Runs independently, but receives signals
@@ -30,11 +28,6 @@ public interface NodeAgent {
     void suspend();
 
     /**
-     * Returns a map containing all relevant NodeAgent variables and their current values.
-     */
-    Map<String, Object> debugInfo();
-
-    /**
      * Starts the agent. After this method is called, the agent will asynchronously maintain the node, continuously
      * striving to make the current state equal to the wanted state.
      */
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index a220557ca9c..805069ac8c9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -30,7 +30,6 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -57,7 +56,6 @@ public class NodeAgentImpl implements NodeAgent {
 
     private static final Logger logger = Logger.getLogger(NodeAgentImpl.class.getName());
 
-
     private final AtomicBoolean terminated = new AtomicBoolean(false);
     private boolean isFrozen = true;
     private boolean wantFrozen = false;
@@ -156,18 +154,6 @@ public class NodeAgentImpl implements NodeAgent {
     }
 
     @Override
-    public Map<String, Object> debugInfo() {
-        Map<String, Object> debug = new LinkedHashMap<>();
-        debug.put("hostname", context.hostname());
-        debug.put("isFrozen", isFrozen);
-        debug.put("wantFrozen", wantFrozen);
-        debug.put("terminated", terminated);
-        debug.put("workToDoNow", workToDoNow);
-        debug.put("nodeRepoState", lastNode.getState().name());
-        return debug;
-    }
-
-    @Override
     public void start() {
         context.log(logger, "Starting with interval " + timeBetweenEachConverge.toMillis() + " ms");
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminStateUpdater.java
index 8a926b511e6..30e892cab07 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminStateUpdater.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.provider;
 import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
-public interface NodeAdminStateUpdater extends NodeAdminDebugHandler {
+public interface NodeAdminStateUpdater {
     enum State { TRANSITIONING, RESUMED, SUSPENDED_NODE_ADMIN, SUSPENDED}
 
     /**