summaryrefslogtreecommitdiffstats
path: root/service-monitor
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2020-03-06 00:34:46 +0100
committerHåkon Hallingstad <hakon@verizonmedia.com>2020-03-06 00:34:46 +0100
commitad7d64ee374cdf6f7a491d7bada5af828b4125b2 (patch)
tree81815e8e3ee5454f66db1e4c74972eacd77d1236 /service-monitor
parent6c0a799266bb8104040c7af2ca3fb905af546c86 (diff)
Provide more insight to duper model completeness
Diffstat (limited to 'service-monitor')
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java2
-rw-r--r--service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
index 2df807e9510..77ccc8b79d0 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModel.java
@@ -42,7 +42,7 @@ public class DuperModel {
void setComplete() {
if (!isComplete) {
- logger.log(LogLevel.INFO, "Bootstrap done - duper model is complete");
+ logger.log(LogLevel.INFO, "All applications have been activated: duper model is complete");
isComplete = true;
listeners.forEach(DuperModelListener::bootstrapComplete);
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
index 9c93bc1d390..baada59dc65 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
@@ -10,6 +10,7 @@ import com.yahoo.config.model.api.SuperModelProvider;
import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.HostName;
import com.yahoo.config.provision.SystemName;
+import com.yahoo.log.LogLevel;
import com.yahoo.vespa.flags.FlagSource;
import com.yahoo.vespa.service.monitor.DuperModelInfraApi;
import com.yahoo.vespa.service.monitor.DuperModelListener;
@@ -23,6 +24,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
+import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -31,6 +33,8 @@ import java.util.stream.Stream;
*/
public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi {
+ private static final Logger logger = Logger.getLogger(DuperModelManager.class.getName());
+
// Infrastructure applications
static final ControllerHostApplication controllerHostApplication = new ControllerHostApplication();
static final ControllerApplication controllerApplication = new ControllerApplication();
@@ -96,6 +100,7 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
synchronized (monitor) {
if (!superModelIsComplete) {
superModelIsComplete = true;
+ logger.log(LogLevel.INFO, "All bootstrap tenant applications have been activated");
maybeSetDuperModelAsComplete();
}
}
@@ -168,6 +173,7 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
synchronized (monitor) {
if (!infraApplicationsIsComplete) {
infraApplicationsIsComplete = true;
+ logger.log(LogLevel.INFO, "All infrastructure applications have been activated");
maybeSetDuperModelAsComplete();
}
}