diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-06-06 11:04:12 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-06-06 11:04:12 +0200 |
commit | 2685f35d1161ec93710a62b465b63e0cc152aba1 (patch) | |
tree | 8b1c71e37e810b0dd46799ef527656b05e6d1cc7 /node-repository | |
parent | f6cccb8d88a611eaefbeebc1eac5928a64fb7cb5 (diff) |
Validate that tensor dimensions and labbels are identifiers
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, 2 insertions, 4 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 62e954afba3..391807ece95 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 @@ -165,14 +165,12 @@ public class NodeRepositoryMaintenance extends AbstractComponent { infrastructureProvisionInterval = Duration.ofMinutes(3); throttlePolicy = NodeFailer.ThrottlePolicy.hosted; - Environment environment = zone.environment(); - if (environment.isTest()) + if (zone.environment().isTest()) retiredExpiry = Duration.ofMinutes(1); // fast turnaround as test envs don't have persistent data else retiredExpiry = Duration.ofDays(4); // give up migrating data after 4 days - - if (environment.equals(Environment.prod) && zone.system() == SystemName.main) { + if (zone.environment().equals(Environment.prod) && zone.system() == SystemName.main) { inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy retiredInterval = Duration.ofMinutes(29); dirtyExpiry = Duration.ofHours(2); // enough time to clean the node |