From f4d482c509c00aa960b74de4e24f7c9e8b9eb361 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 13 Oct 2021 09:27:56 +0200 Subject: Move ActivationConflictException to config-provisioning Move, so that it can be used in MaintenanceDeployment --- .../vespa/config/server/ActivationConflictException.java | 15 --------------- .../yahoo/vespa/config/server/ApplicationRepository.java | 3 ++- .../com/yahoo/vespa/config/server/http/HttpHandler.java | 6 +++--- .../vespa/config/server/ApplicationRepositoryTest.java | 1 + 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 configserver/src/main/java/com/yahoo/vespa/config/server/ActivationConflictException.java (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ActivationConflictException.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ActivationConflictException.java deleted file mode 100644 index 8dac35616f0..00000000000 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ActivationConflictException.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server; - -/** - * Exception used when activation cannot be done because activation is for - * an older session than the one that is active now or because current active - * session has changed since the session to be activated was created - * - * @author hmusum - */ -public class ActivationConflictException extends RuntimeException { - public ActivationConflictException(String s) { - super(s); - } -} 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 368324fa843..e0629a2e5db 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 @@ -22,6 +22,7 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; +import com.yahoo.config.provision.exception.ActivationConflictException; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.SecretStoreProvider; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -486,7 +487,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye // Config generation is equal to session id, and config generation must be a monotonically increasing number static void checkIfActiveIsNewerThanSessionToBeActivated(long sessionId, long currentActiveSessionId) { if (sessionId < currentActiveSessionId) { - throw new ActivationConflictException("It is not possible to activate session " + sessionId + + throw new ActivationConflictException("Cannot activate session " + sessionId + ", because it is older than current active session (" + currentActiveSessionId + ")"); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java index ea7d0e03812..2dad2c060cc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java @@ -3,19 +3,19 @@ package com.yahoo.vespa.config.server.http; import com.yahoo.config.provision.ApplicationLockException; import com.yahoo.config.provision.CertificateNotReadyException; +import com.yahoo.config.provision.OutOfCapacityException; import com.yahoo.config.provision.ParentHostUnavailableException; +import com.yahoo.config.provision.exception.ActivationConflictException; import com.yahoo.config.provision.exception.LoadBalancerServiceException; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.LoggingRequestHandler; -import java.util.logging.Level; -import com.yahoo.config.provision.OutOfCapacityException; -import com.yahoo.vespa.config.server.ActivationConflictException; import com.yahoo.yolean.Exceptions; import java.io.PrintWriter; import java.io.StringWriter; import java.time.Duration; +import java.util.logging.Level; /** * Super class for http handlers, that takes care of checking valid 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 28d50a5396e..133570cc109 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 @@ -17,6 +17,7 @@ import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.TenantName; +import com.yahoo.config.provision.exception.ActivationConflictException; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.io.IOUtils; import com.yahoo.jdisc.Metric; -- cgit v1.2.3