Reduce NodeFailer activate timeout
// Copyright Yahoo. 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.yahoo.concurrent.UncheckedTimeoutException;
import com.yahoo.config.provision.Deployer;
import com.yahoo.config.provision.Deployment;
import com.yahoo.config.provision.NodeType;
@@ -186,7 +187,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
*/
private boolean failActive(FailingNode failing) {
Optional<Deployment> deployment =
- deployer.deployFromLocalActive(failing.node().allocation().get().owner(), Duration.ofMinutes(30));
+ deployer.deployFromLocalActive(failing.node().allocation().get().owner(), Duration.ofMinutes(5));
if (deployment.isEmpty()) return false;
// If the active node that we are trying to fail is of type host, we need to successfully fail all
@@ -214,11 +215,12 @@ public class NodeFailer extends NodeRepositoryMaintainer {
}
if (activeChildrenToFail.isEmpty()) {
+ log.log(Level.INFO, "Failing out " + failing.node + ": " + failing.reason);
wantToFail(failing.node(), true, lock);
try {
deployment.get().activate();
return true;
- } catch (TransientException e) {
+ } catch (TransientException | UncheckedTimeoutException e) {
log.log(Level.INFO, "Failed to redeploy " + failing.node().allocation().get().owner() +
" with a transient error, will be retried by application maintainer: " +
Exceptions.toMessageString(e));
