diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-07-06 10:06:10 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-07-06 10:06:10 +0200 |
commit | 95540cadc561a0d286d9439602d5ecb396e9f8db (patch) | |
tree | 36a67a5aae7c8aacfd3a3ed15ff75aa6d3881554 /controller-server | |
parent | b5e421942570cf18c840124e2528642b9f143e08 (diff) |
Acquire locks in the same order everywhere
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 8 |
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. |