Merge pull request #6350 from vespa-engine/jvenstad/deployment-pipeline

Acquire locks in the same order everywhere

1 files changed, 4 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 93b915cc194..9ced75303ff 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -228,12 +228,12 @@ public class JobController {
                .forEach(id -> {
                    try {
                        for (JobType type : jobs(id))
-                           try (Lock __ = curator.lock(id, type)) {
-                               locked(id, type, deactivateTester, ___ -> {
+                           locked(id, type, deactivateTester, __ -> {
+                               try (Lock ___ = curator.lock(id, type)) {
                                    deactivateTester(id, type);
                                    curator.deleteJobData(id, type);
-                               });
-                           }
+                               }
+                           });
                    }
                    catch (TimeoutException e) {
                        return; // Don't remove the data if we couldn't deactivate all testers.