diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-09-05 11:20:49 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-09-05 11:23:19 +0200 |
commit | 42c663f97ab2b4bbc6c5890e11095a548134e22f (patch) | |
tree | 6436643a867b48f93bc085412597bf9ae06b41e9 /configserver | |
parent | e58037f289cba5c58c81be096351ae1bc24dbaa6 (diff) |
Remove unused code
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 12 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java | 28 |
2 files changed, 0 insertions, 40 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index c3650b930a4..3c95e008f7a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -783,18 +783,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye return port; } - /** Returns version to use when deploying application in given environment */ - static Version decideVersion(ApplicationId application, Environment environment, Version sessionVersion, boolean bootstrap) { - if ( environment.isManuallyDeployed() - && sessionVersion.getMajor() == Vtag.currentVersion.getMajor() - && ! HOSTED_VESPA_TENANT.equals(application.tenant()) // Never change version of system applications - && ! application.instance().isTester() // Never upgrade tester containers - && ! bootstrap) { // Do not use current version when bootstrapping config server - return Vtag.currentVersion; - } - return sessionVersion; - } - public Slime createDeployLog() { Slime deployLog = new Slime(); deployLog.setObject(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 9b76c349259..589c3fcba6a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -207,34 +207,6 @@ public class ApplicationRepositoryTest { } @Test - public void decideVersion() { - ApplicationId regularApp = ApplicationId.from("tenant1", "application1", "default"); - ApplicationId systemApp = ApplicationId.from("hosted-vespa", "routing", "default"); - ApplicationId testerApp = ApplicationId.from("tenant1", "application1", "default-t"); - Version sessionVersion = new Version(Vtag.currentVersion.getMajor(), 0); - Version oldSessionVersion = Version.fromString("5.0"); - - // Always use session version for system application - assertEquals(sessionVersion, ApplicationRepository.decideVersion(systemApp, Environment.prod, sessionVersion, false)); - assertEquals(sessionVersion, ApplicationRepository.decideVersion(systemApp, Environment.dev, sessionVersion, false)); - assertEquals(sessionVersion, ApplicationRepository.decideVersion(systemApp, Environment.perf, sessionVersion, false)); - - // Always use session version for tester application - assertEquals(sessionVersion, ApplicationRepository.decideVersion(testerApp, Environment.prod, sessionVersion, false)); - assertEquals(sessionVersion, ApplicationRepository.decideVersion(testerApp, Environment.dev, sessionVersion, false)); - assertEquals(sessionVersion, ApplicationRepository.decideVersion(testerApp, Environment.perf, sessionVersion, false)); - - // Target for regular application depends on environment and major compatibility - assertEquals(sessionVersion, ApplicationRepository.decideVersion(regularApp, Environment.prod, sessionVersion, false)); - assertEquals(Vtag.currentVersion, ApplicationRepository.decideVersion(regularApp, Environment.dev, sessionVersion, false)); - assertEquals(oldSessionVersion, ApplicationRepository.decideVersion(regularApp, Environment.dev, oldSessionVersion, false)); - - // If bootstrap, version should be target version - assertEquals(sessionVersion, ApplicationRepository.decideVersion(regularApp, Environment.dev, sessionVersion, true)); - assertEquals(Vtag.currentVersion, ApplicationRepository.decideVersion(regularApp, Environment.perf, sessionVersion, false)); - } - - @Test public void deleteUnusedFileReferences() throws IOException { File fileReferencesDir = temporaryFolder.newFolder(); |