diff options
author | freva <valerijf@yahoo-inc.com> | 2017-01-12 15:19:18 +0100 |
---|---|---|
committer | freva <valerijf@yahoo-inc.com> | 2017-01-12 15:19:18 +0100 |
commit | a9b18772e4fbf57563401b36d5c6b93710f10a71 (patch) | |
tree | b897fbbb12140e35db9c0034c8f3365ab72ef820 /node-admin | |
parent | d433b1cd3fdad87f4fab647eeb7e564159ab768d (diff) |
Update metrics even when not in active state
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 6 | ||||
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java | 11 |
2 files changed, 8 insertions, 9 deletions
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 dc3d2f9b4a2..7f1ce37c1d2 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 @@ -292,8 +292,8 @@ public class NodeAgentImpl implements NodeAgent { @Override public void stopServices(ContainerName containerName) { - logger.info("Stopping services for " + containerName); - dockerOperations.stopServicesOnNode(containerName); + logger.info("Stopping services for " + containerName); + dockerOperations.stopServicesOnNode(containerName); } private Optional<String> shouldRemoveContainer(ContainerNodeSpec nodeSpec, Container existingContainer) { @@ -473,7 +473,7 @@ public class NodeAgentImpl implements NodeAgent { nodeSpec = lastNodeSpec; } - if (nodeSpec == null || nodeSpec.nodeState != Node.State.active) return; + if (nodeSpec == null || !vespaVersion.isPresent()) return; Optional<Docker.ContainerStats> containerStats = dockerOperations.getContainerStats(nodeSpec.containerName); if ( ! containerStats.isPresent()) return; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index 7c1c117f27e..d77ac2f8507 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -15,7 +15,6 @@ import com.yahoo.vespa.hosted.provision.Node; import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; @@ -227,14 +226,14 @@ public class LocalZoneUtils { public static void packageApp(Path pathToApp) { try { - InputStream is = Runtime.getRuntime().exec("mvn package", null, pathToApp.toFile()).getInputStream(); - - InputStreamReader isr = new InputStreamReader(is); - BufferedReader buff = new BufferedReader (isr); + Process process = Runtime.getRuntime().exec("mvn package", null, pathToApp.toFile()); + BufferedReader buff = new BufferedReader(new InputStreamReader(process.getInputStream())); String line; while((line = buff.readLine()) != null) System.out.println(line); - } catch (IOException e) { + + assert process.waitFor() == 0; + } catch (IOException | InterruptedException e) { throw new RuntimeException("Failed to package application", e); } } |