diff options
author | Harald Musum <musum@yahooinc.com> | 2023-10-30 07:40:52 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-10-30 07:40:52 +0100 |
commit | a7f9edbb6c309b85f28543cc0e58aeec1083c31d (patch) | |
tree | 5d90451a687aec979cb691e95639d4bdc58e14a7 /configserver | |
parent | e5f53beca8c5e69f4656c424f0ef1963b75ccd48 (diff) |
Delete zookeeper session as well when deployment fails
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 4 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index c7877c23323..9c7e018545f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -40,6 +40,7 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import static com.yahoo.vespa.config.server.application.ConfigConvergenceChecker.ServiceListResponse; +import static com.yahoo.vespa.config.server.session.Session.Status.DELETE; /** * The process of deploying an application. @@ -162,6 +163,9 @@ public class Deployment implements com.yahoo.config.provision.Deployment { private void deleteSession() { sessionRepository().deleteLocalSession(session.getSessionId()); + try (var transaction = sessionRepository().createSetStatusTransaction(session, DELETE)) { + transaction.commit(); + } } private SessionRepository sessionRepository() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java index da5169cf493..5105bcbdc28 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java @@ -55,7 +55,7 @@ public class RemoteSession extends Session { @Override public String toString() { - return super.toString() + ",application set=" + applicationVersions; + return super.toString() + ", application versions=" + applicationVersions; } } |