summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-07-05 08:57:07 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-07-05 08:57:07 +0200
commit40d693f04319e09024eea27286c65414768d8bd4 (patch)
tree6eb490aaeef6a1fb0e46f0077d935c9cefbaea75 /node-repository
parenteb529ef3ab760c4a429c63a299eafb393aae84f8 (diff)
Code review fixes
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/retire/RetirementPolicy.java3
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/retire/RetirementPolicy.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/retire/RetirementPolicy.java
index 4971d8ea1c9..ca0419f11c3 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/retire/RetirementPolicy.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/retire/RetirementPolicy.java
@@ -10,6 +10,9 @@ import java.util.Optional;
*/
public interface RetirementPolicy {
+ /**
+ * Returns whether the policy is currently active. NodeRetirer ask every time before executing.
+ */
boolean isActive();
/**
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java
index a5369e4f89c..13ac7b6f2d3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTest.java
@@ -38,8 +38,8 @@ public class NodeRetirerTest {
@Before
public void setup() {
- doAnswer(invok -> {
- boolean shouldRetire = ((Node) invok.getArguments()[0]).ipAddresses().equals(Collections.singleton("::1"));
+ doAnswer(invoke -> {
+ boolean shouldRetire = ((Node) invoke.getArguments()[0]).ipAddresses().equals(Collections.singleton("::1"));
return shouldRetire ? Optional.of("Some reason") : Optional.empty();
}).when(policy).shouldRetire(any(Node.class));
when(policy.isActive()).thenReturn(true);