diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-20 15:18:16 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-20 15:18:16 +0200 |
commit | 8cad28106bfe5d25ddefba52425260d9a09aeced (patch) | |
tree | fc3a40089a5558b6d5f9b7b605c28f4967508256 /node-repository | |
parent | a52195783c2d002eb8b026ea258df8f00a220cb9 (diff) |
Inline method parameter
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index 22a47c24845..a38a3fd15f5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -70,7 +70,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { jobControl = new JobControl(nodeRepository.database()); infrastructureVersions = new InfrastructureVersions(nodeRepository.database()); - nodeFailer = new NodeFailer(deployer, hostLivenessTracker, serviceMonitor, nodeRepository, durationFromEnv("fail_grace").orElse(defaults.failGrace), clock, orchestrator, throttlePolicyFromEnv("throttle_policy").orElse(defaults.throttlePolicy), metric, jobControl, configserverConfig); + nodeFailer = new NodeFailer(deployer, hostLivenessTracker, serviceMonitor, nodeRepository, durationFromEnv("fail_grace").orElse(defaults.failGrace), clock, orchestrator, throttlePolicyFromEnv().orElse(defaults.throttlePolicy), metric, jobControl, configserverConfig); periodicApplicationMaintainer = new PeriodicApplicationMaintainer(deployer, nodeRepository, defaults.redeployMaintainerInterval, durationFromEnv("periodic_redeploy_interval").orElse(defaults.periodicRedeployInterval), jobControl); operatorChangeApplicationMaintainer = new OperatorChangeApplicationMaintainer(deployer, nodeRepository, clock, durationFromEnv("operator_change_redeploy_interval").orElse(defaults.operatorChangeRedeployInterval), jobControl); reservationExpirer = new ReservationExpirer(nodeRepository, clock, durationFromEnv("reservation_expiry").orElse(defaults.reservationExpiry), jobControl); @@ -117,8 +117,8 @@ public class NodeRepositoryMaintenance extends AbstractComponent { return Optional.ofNullable(System.getenv(envPrefix + envVariable)).map(Long::parseLong).map(Duration::ofSeconds); } - private static Optional<NodeFailer.ThrottlePolicy> throttlePolicyFromEnv(String envVariable) { - String policyName = System.getenv(envPrefix + envVariable); + private static Optional<NodeFailer.ThrottlePolicy> throttlePolicyFromEnv() { + String policyName = System.getenv(envPrefix + "throttle_policy"); try { return Optional.ofNullable(policyName).map(NodeFailer.ThrottlePolicy::valueOf); } catch (IllegalArgumentException e) { |