diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-21 12:32:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 12:32:40 +0200 |
commit | 38d3fedeb51ff66e86a8bd1ccdfeabbcc11b642d (patch) | |
tree | 09d2d64840058fa682185ceca8d7ccc50d12225a /node-repository | |
parent | ec0ec4bffdf259eaf36ac484414cb4139de325cf (diff) | |
parent | cab9d5745bcfbae60d99fe438c0ed3c28c49204d (diff) |
Merge pull request #11031 from vespa-engine/hakonhall/return-504-gateway-timeout-on-lock-timeout-from-orchestrator
Return 504 Gateway Timeout on lock timeout from Orchestrator
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java index dea0b8c19d0..acf742842c8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; +import com.google.common.util.concurrent.UncheckedTimeoutException; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.Deployment; @@ -117,6 +118,9 @@ public class RetiredExpirer extends Maintainer { orchestrator.acquirePermissionToRemove(new HostName(node.hostname())); log.info("Node " + node + " has been granted permission to be removed"); return true; + } catch (UncheckedTimeoutException e) { + log.info("Timed out trying to aquire permission to remove " + node.hostname() + ": " + e.getMessage()); + return false; } catch (OrchestrationException e) { log.info("Did not get permission to remove retired " + node + ": " + e.getMessage()); return false; |