Fail cfg bootstrap if activation of infra apps fails

1 files changed, 8 insertions, 4 deletions

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 60e4c30a634..15c461c7f59 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
@@ -94,8 +94,10 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
             @Override
             public void notifyOfCompleteness(SuperModel superModel) {
                 synchronized (monitor) {
-                    superModelIsComplete = true;
-                    maybeSetDuperModelAsComplete();
+                    if (!superModelIsComplete) {
+                        superModelIsComplete = true;
+                        maybeSetDuperModelAsComplete();
+                    }
                 }
             }
         });
@@ -164,8 +166,10 @@ public class DuperModelManager implements DuperModelProvider, DuperModelInfraApi
     @Override
     public void infraApplicationsIsNowComplete() {
         synchronized (monitor) {
-            this.infraApplicationsIsComplete = true;
-            maybeSetDuperModelAsComplete();
+            if (!infraApplicationsIsComplete) {
+                infraApplicationsIsComplete = true;
+                maybeSetDuperModelAsComplete();
+            }
         }
     }