Merge pull request #12056 from vespa-engine/balder/default-initializing

Default state is 'initializing', not 'up'.

3 files changed, 17 insertions, 13 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
index 0be9f47f6cf..faa08402cdc 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
@@ -14,6 +14,7 @@ import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
 /**
@@ -27,7 +28,7 @@ public class StateMonitor extends AbstractComponent {
 
     private final static Logger log = Logger.getLogger(StateMonitor.class.getName());
 
-    public enum Status {up, down, initializing};
+    public enum Status {up, down, initializing}
 
     private final CopyOnWriteArrayList<StateMetricConsumer> consumers = new CopyOnWriteArrayList<>();
     private final Thread thread;
@@ -37,6 +38,7 @@ public class StateMonitor extends AbstractComponent {
     private volatile MetricSnapshot snapshot;
     private volatile Status status;
     private final TreeSet<String> valueNames = new TreeSet<>();
+    private final AtomicBoolean stopped = new AtomicBoolean(false);
 
     /** For testing */
     public StateMonitor() {
@@ -105,13 +107,13 @@ public class StateMonitor extends AbstractComponent {
     private void run() {
         log.finest("StateMonitor started.");
         try {
-            while (!Thread.interrupted()) {
-                checkTime();
-                Thread.sleep((lastSnapshotTimeMs + snapshotIntervalMs) - timer.currentTimeMillis());
+            synchronized (stopped) {
+                while (!stopped.get()) {
+                    checkTime();
+                    stopped.wait((lastSnapshotTimeMs + snapshotIntervalMs) - timer.currentTimeMillis());
+                }
             }
-        } catch (InterruptedException e) {
-
-        }
+        } catch (InterruptedException e) { }
         log.finest("StateMonitor stopped.");
     }
 
@@ -143,12 +145,13 @@ public class StateMonitor extends AbstractComponent {
 
     @Override
     public void deconstruct() {
-        thread.interrupt();
+        synchronized (stopped) {
+            stopped.set(true);
+            stopped.notifyAll();
+        }
         try {
             thread.join(5000);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
+        } catch (InterruptedException e) { }
         if (thread.isAlive()) {
             log.warning("StateMonitor failed to terminate within 5 seconds of interrupt signal. Ignoring.");
         }
diff --git a/container-core/src/main/resources/configdefinitions/health-monitor.def b/container-core/src/main/resources/configdefinitions/health-monitor.def
index 5e70c72ae3f..4e91d85b2b8 100644
--- a/container-core/src/main/resources/configdefinitions/health-monitor.def
+++ b/container-core/src/main/resources/configdefinitions/health-monitor.def
@@ -6,4 +6,4 @@ namespace=container.jdisc.config
 snapshot_interval double default=300
 
 # Initial status used in /state/v1/health API (value for 'code' in 'status'). See StateMonitor for valid values
-initialStatus string default="up"
+initialStatus string default="initializing"
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
index 78541137db5..8a1640e2c0e 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
@@ -57,7 +57,8 @@ public class StateHandlerTestBase {
         HealthMonitorConfig healthMonitorConfig =
                 new HealthMonitorConfig(
                         new HealthMonitorConfig.Builder()
-                                .snapshot_interval(TimeUnit.MILLISECONDS.toSeconds(SNAPSHOT_INTERVAL)));
+                                .snapshot_interval(TimeUnit.MILLISECONDS.toSeconds(SNAPSHOT_INTERVAL))
+                                .initialStatus("up"));
         ThreadFactory threadFactory = ignored -> mock(Thread.class);
         this.monitor = new StateMonitor(healthMonitorConfig, timer, threadFactory);
         builder.guiceModules().install(new AbstractModule() {