Remove unused parameter

7 files changed, 16 insertions, 31 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 6aa5ad81309..ea7b6a88a9c 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
@@ -161,22 +161,22 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     }
 
     public PrepareResult prepareAndActivate(Tenant tenant, long sessionId, PrepareParams prepareParams,
-                                            boolean ignoreLockFailure, boolean ignoreSessionStaleFailure, Instant now) {
+                                            boolean ignoreSessionStaleFailure, Instant now) {
         PrepareResult result = prepare(tenant, sessionId, prepareParams, now);
-        activate(tenant, sessionId, prepareParams.getTimeoutBudget(), ignoreLockFailure, ignoreSessionStaleFailure);
+        activate(tenant, sessionId, prepareParams.getTimeoutBudget(), ignoreSessionStaleFailure);
         return result;
     }
 
     public PrepareResult deploy(CompressedApplicationInputStream in, PrepareParams prepareParams) {
-        return deploy(in, prepareParams, false, false, clock.instant());
+        return deploy(in, prepareParams, false, clock.instant());
     }
 
     public PrepareResult deploy(CompressedApplicationInputStream in, PrepareParams prepareParams,
-                                boolean ignoreLockFailure, boolean ignoreSessionStaleFailure, Instant now) {
+                                boolean ignoreSessionStaleFailure, Instant now) {
         File tempDir = Files.createTempDir();
         PrepareResult prepareResult;
         try {
-            prepareResult = deploy(decompressApplication(in, tempDir), prepareParams, ignoreLockFailure, ignoreSessionStaleFailure, now);
+            prepareResult = deploy(decompressApplication(in, tempDir), prepareParams, ignoreSessionStaleFailure, now);
         } finally {
             cleanupTempDirectory(tempDir);
         }
@@ -184,15 +184,15 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     }
 
     public PrepareResult deploy(File applicationPackage, PrepareParams prepareParams) {
-        return deploy(applicationPackage, prepareParams, false, false, Instant.now());
+        return deploy(applicationPackage, prepareParams, false, Instant.now());
     }
 
     public PrepareResult deploy(File applicationPackage, PrepareParams prepareParams,
-                                boolean ignoreLockFailure, boolean ignoreSessionStaleFailure, Instant now) {
+                                boolean ignoreSessionStaleFailure, Instant now) {
         ApplicationId applicationId = prepareParams.getApplicationId();
         long sessionId = createSession(applicationId, prepareParams.getTimeoutBudget(), applicationPackage);
         Tenant tenant = tenantRepository.getTenant(applicationId.tenant());
-        return prepareAndActivate(tenant, sessionId, prepareParams, ignoreLockFailure, ignoreSessionStaleFailure, now);
+        return prepareAndActivate(tenant, sessionId, prepareParams, ignoreSessionStaleFailure, now);
     }
 
     /**
@@ -271,11 +271,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     public ApplicationId activate(Tenant tenant,
                                   long sessionId,
                                   TimeoutBudget timeoutBudget,
-                                  boolean ignoreLockFailure,
                                   boolean ignoreSessionStaleFailure) {
         LocalSession localSession = getLocalSession(tenant, sessionId);
         Deployment deployment = deployFromPreparedSession(localSession, tenant, timeoutBudget.timeLeft());
-        deployment.setIgnoreLockFailure(ignoreLockFailure);
         deployment.setIgnoreSessionStaleFailure(ignoreSessionStaleFailure);
         deployment.activate();
         return localSession.getApplicationId();
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 a59d38c7603..21716730825 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
@@ -56,7 +56,6 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
     /** Whether this model should be validated (only takes effect if prepared=false) */
     private boolean validate;
 
-    private boolean ignoreLockFailure = false;
     private boolean ignoreSessionStaleFailure = false;
 
     private Deployment(LocalSession session, ApplicationRepository applicationRepository,
@@ -90,11 +89,6 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
                               timeout, clock, true, true, session.getVespaVersion(), isBootstrap);
     }
 
-    public Deployment setIgnoreLockFailure(boolean ignoreLockFailure) {
-        this.ignoreLockFailure = ignoreLockFailure;
-        return this;
-    }
-
     public Deployment setIgnoreSessionStaleFailure(boolean ignoreSessionStaleFailure) {
         this.ignoreSessionStaleFailure = ignoreSessionStaleFailure;
         return this;
@@ -171,12 +165,12 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
         return sessionId;
     }
 
-    private Transaction deactivateCurrentActivateNew(LocalSession currentActiveSession, LocalSession session, boolean ignoreStaleSessionFailure) {
-        Transaction transaction = session.createActivateTransaction();
-        if (isValidSession(currentActiveSession)) {
-            checkIfActiveHasChanged(session, currentActiveSession, ignoreStaleSessionFailure);
-            checkIfActiveIsNewerThanSessionToBeActivated(session.getSessionId(), currentActiveSession.getSessionId());
-            transaction.add(currentActiveSession.createDeactivateTransaction().operations());
+    private Transaction deactivateCurrentActivateNew(LocalSession active, LocalSession prepared, boolean ignoreStaleSessionFailure) {
+        Transaction transaction = prepared.createActivateTransaction();
+        if (isValidSession(active)) {
+            checkIfActiveHasChanged(prepared, active, ignoreStaleSessionFailure);
+            checkIfActiveIsNewerThanSessionToBeActivated(prepared.getSessionId(), active.getSessionId());
+            transaction.add(active.createDeactivateTransaction().operations());
         }
         return transaction;
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
index 63703e45e0c..59d12e037e9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
@@ -75,10 +75,6 @@ public class SessionHandler extends HttpHandler {
         return new DeployHandlerLogger(deployLog.get().setArray("log"), verbose, app);
     }
 
-    protected static boolean shouldIgnoreLockFailure(HttpRequest request) {
-        return request.getBooleanProperty("force");
-    }
-
     /**
      * True if this request should ignore activation failure because the session was made from an active session that is not active now
      * @param request a {@link com.yahoo.container.jdisc.HttpRequest}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
index 411e24cdbc6..7f409e4c8fa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
@@ -54,7 +54,6 @@ public class ApplicationApiHandler extends SessionHandler {
         PrepareParams prepareParams = PrepareParams.fromHttpRequest(request, tenantName, zookeeperBarrierTimeout);
 
         PrepareResult result = applicationRepository.prepareAndActivate(tenant, sessionId, prepareParams,
-                                                                        shouldIgnoreLockFailure(request),
                                                                         shouldIgnoreSessionStaleFailure(request),
                                                                         Instant.now());
         return new SessionPrepareAndActivateResponse(result, tenantName, request, prepareParams.getApplicationId(), zone);
@@ -70,7 +69,6 @@ public class ApplicationApiHandler extends SessionHandler {
         PrepareResult result =
                 applicationRepository.deploy(CompressedApplicationInputStream.createFromCompressedStream(request.getData(), request.getHeader(contentTypeHeader)),
                                              prepareParams,
-                                             shouldIgnoreLockFailure(request),
                                              shouldIgnoreSessionStaleFailure(request),
                                              Instant.now());
         return new SessionPrepareAndActivateResponse(result, tenantName, request, prepareParams.getApplicationId(), zone);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
index 2ccef8b85df..b34fe490c3a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
@@ -50,7 +50,6 @@ public class SessionActiveHandler extends SessionHandler {
         TimeoutBudget timeoutBudget = getTimeoutBudget(request, DEFAULT_ACTIVATE_TIMEOUT);
         final Long sessionId = getSessionIdV2(request);
         ApplicationId applicationId = applicationRepository.activate(tenant, sessionId, timeoutBudget,
-                                                                     shouldIgnoreLockFailure(request),
                                                                      shouldIgnoreSessionStaleFailure(request));
         ApplicationMetaData metaData = applicationRepository.getMetadataFromSession(tenant, sessionId);
         return new SessionActiveResponse(metaData.getSlime(), request, applicationId, sessionId, zone);
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 ad25777cdf8..3d94dedf651 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
@@ -316,7 +316,7 @@ public class ApplicationRepositoryTest {
         ApplicationId applicationId = applicationId();
         long sessionId = applicationRepository.createSession(applicationId, timeoutBudget, appDir.getAppDir());
         return applicationRepository.prepareAndActivate(tenantRepository.getTenant(applicationId.tenant()),
-                                                        sessionId, prepareParams(), false, false, Instant.now());
+                                                        sessionId, prepareParams(), false, Instant.now());
     }
 
     private PrepareResult deployApp(File applicationPackage) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index c96113b9462..7ffb9552cf8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -177,7 +177,7 @@ public class DeployTester {
         if (vespaVersion != null)
             paramsBuilder.vespaVersion(vespaVersion);
 
-        return applicationRepository.deploy(new File(applicationPath), paramsBuilder.build(), false, false, now);
+        return applicationRepository.deploy(new File(applicationPath), paramsBuilder.build(), false, now);
     }
 
     public AllocatedHosts getAllocatedHostsOf(ApplicationId applicationId) {