diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-23 18:11:44 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-23 18:11:44 +0100 |
commit | 988131792a9bf0cd22072622ec3ffd2d62efa62d (patch) | |
tree | 4e2f0e4a2c6638cc12a4ac3d3145f85bb745bebc /service-monitor/src/test/java | |
parent | 465e0e5ab20337d9f8023cb0371c57927be06ff6 (diff) |
Define completeness of SuperModel and DuperModel
In order for Orchestrator to remove application data from ZooKeeper, it must
know which applications do NOT exist. Since the duper model starts with 0
applications, always, the only way of knowing what applications do not exist is
for the bootstrap code to notify the super model/duper model when bootstrap is
complete. There are 2 sources of applications that must signal completeness:
- The super model, once all applications have been redeployed in
ConfigServerBootstrap.
- The infrastructure application, in the InfrastructureProvisioner the first
time it runs.
Diffstat (limited to 'service-monitor/src/test/java')
-rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java | 1 | ||||
-rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java index 31fd266649a..dc90035be71 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.service.duper; import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.vespa.service.monitor.DuperModelListener; import org.junit.Before; import org.junit.Test; diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java index 0f7c0dde357..3fb10f1f24e 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java @@ -47,7 +47,7 @@ public class ExampleModel { Map<ApplicationId, ApplicationInfo> applicationInfos = new HashMap<>(); applicationInfos.put(applicationInfo.getApplicationId(), applicationInfo); - return new SuperModel(applicationInfos); + return new SuperModel(applicationInfos, true); } public static ApplicationBuilder createApplication(String tenant, |