Merge pull request #21661 from vespa-engine/jonmv/check-wanted-version-instead

Check wanted version instead of newest built model

1 files changed, 7 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 8390cc59b6f..ac99bee93ed 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -108,6 +108,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     public static final Logger log = Logger.getLogger(VespaModel.class.getName());
 
     private final Version version;
+    private final Version wantedNodeVersion;
     private final ConfigModelRepo configModelRepo = new ConfigModelRepo();
     private final AllocatedHosts allocatedHosts;
 
@@ -170,6 +171,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
             throws IOException, SAXException {
         super("vespamodel");
         version = deployState.getVespaVersion();
+        wantedNodeVersion = deployState.getWantedNodeVespaVersion();
         fileReferencesRepository = new FileReferencesRepository(deployState.getFileRegistry());
         rankingConstants = new RankingConstants(deployState.getFileRegistry(), Optional.empty());
         validationOverrides = deployState.validationOverrides();
@@ -407,6 +409,11 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
         return version;
     }
 
+    @Override
+    public Version wantedNodeVersion() {
+        return wantedNodeVersion;
+    }
+
     /**
      * Resolves config of the given type and config id, by first instantiating the correct {@link com.yahoo.config.ConfigInstance.Builder},
      * calling {@link #getConfig(com.yahoo.config.ConfigInstance.Builder, String)}. The default values used will be those of the config