diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2022-03-16 15:00:28 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2022-03-16 15:00:28 +0100 |
commit | a807f71ca66ad831bccc40bc34f680c7c7315bca (patch) | |
tree | 1457b21077213972fa318539497888b5928136d5 /configserver | |
parent | 89c00be86b2de199ab125d0bc662e6b429dc662d (diff) |
Add application id dimension to incompatibility flag
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index 02b48c9d626..28487106268 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -27,6 +27,7 @@ import com.yahoo.vespa.curator.CompletionTimeoutException; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.Lock; import com.yahoo.vespa.curator.transaction.CuratorTransaction; +import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.ListFlag; import com.yahoo.vespa.flags.PermanentFlags; @@ -49,6 +50,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import static com.yahoo.vespa.curator.Curator.CompletionWaiter; +import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; import static java.util.stream.Collectors.toSet; /** @@ -393,7 +395,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica if (vespaVersion.isEmpty()) return true; Version wantedVersion = applicationMapper.getForVersion(application, Optional.empty(), clock.instant()) .getModel().wantedNodeVersion(); - return VersionCompatibility.fromVersionList(incompatibleVersions.value()) + return VersionCompatibility.fromVersionList(incompatibleVersions.with(APPLICATION_ID, application.serializedForm()).value()) .accept(vespaVersion.get(), wantedVersion); } |