aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-02-21 16:55:42 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-02-22 12:29:21 +0100
commit197a221613d35606802e9b96d5e23228d58bc94b (patch)
tree0fa930ae701cfee195ff27950c92730d74cacab3 /node-admin
parenta42fc330985c2ca07af5cfc538034c43bab64507 (diff)
Remove scheduleReboot()
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java14
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java8
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java5
4 files changed, 0 insertions, 29 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
index 354f4145ba4..4cce6ce08d6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeRepository.java
@@ -25,6 +25,4 @@ public interface NodeRepository {
void updateNodeAttributes(String hostName, NodeAttributes nodeAttributes);
void setNodeState(String hostName, NodeState nodeState);
-
- void scheduleReboot(String hostname);
}
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index ad29222c8e3..586dec3399c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.yahoo.config.provision.NodeType;
import com.yahoo.vespa.hosted.dockerapi.DockerImage;
@@ -31,7 +30,6 @@ import java.util.stream.Stream;
*/
public class RealNodeRepository implements NodeRepository {
private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(RealNodeRepository.class);
- private static final ObjectMapper mapper = new ObjectMapper();
private final ConfigServerApi configServerApi;
@@ -144,18 +142,6 @@ public class RealNodeRepository implements NodeRepository {
throw new NodeRepositoryException("Unexpected message " + response.message + " " + response.errorCode);
}
- @Override
- public void scheduleReboot(String hostName) {
- NodeMessageResponse response = configServerApi.post(
- "/nodes/v2/command/reboot?hostname=" + hostName,
- Optional.empty(), /* body */
- NodeMessageResponse.class);
- NODE_ADMIN_LOGGER.info(response.message);
-
- if (Strings.isNullOrEmpty(response.errorCode)) return;
- throw new NodeRepositoryException("Unexpected message " + response.message + " " + response.errorCode);
- }
-
private static NodeSpec createNodeSpec(NodeRepositoryNode node) {
Objects.requireNonNull(node.type, "Unknown node type");
NodeType nodeType = NodeType.valueOf(node.type);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
index 566d2ecc444..c2b4c1e0387 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
@@ -190,12 +190,4 @@ public class RealNodeRepositoryTest {
assertTrue(nodeRepositoryApi.getOptionalNode("host123-1.domain.tld").isPresent());
}
-
- @Test
- public void testRebootScheduling() {
- NodeSpec nodeSpec = nodeRepositoryApi.getNode("host5.yahoo.com");
- nodeRepositoryApi.scheduleReboot(nodeSpec.getHostname());
- NodeSpec newNodeSpec = nodeRepositoryApi.getNode(nodeSpec.getHostname());
- assertEquals(nodeSpec.getWantedRebootGeneration() + 1, newNodeSpec.getWantedRebootGeneration());
- }
}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
index ea4e2e4f6eb..ebf9d72ff1b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java
@@ -67,11 +67,6 @@ public class NodeRepoMock implements NodeRepository {
}
}
- @Override
- public void scheduleReboot(String hostname) {
-
- }
-
void updateNodeRepositoryNode(NodeSpec nodeSpec) {
synchronized (monitor) {
nodeRepositoryNodesByHostname.put(nodeSpec.getHostname(), nodeSpec);