From a9b18772e4fbf57563401b36d5c6b93710f10a71 Mon Sep 17 00:00:00 2001
From: freva <valerijf@yahoo-inc.com>
Date: Thu, 12 Jan 2017 15:19:18 +0100
Subject: Update metrics even when not in active state

---
 .../vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java      |  6 +++---
 .../yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java  | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'node-admin')

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);
         }
     }
-- 
cgit v1.2.3