diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-26 10:48:11 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-26 10:48:11 +0200 |
commit | b24caf8109d63a70230849c449872984debe6ddd (patch) | |
tree | f20184cfff8398c54e5a299f3c42be392d4031f8 /node-repository | |
parent | 40184b458f28e2edc6cbd8b42dcca9f2b9fc9519 (diff) |
More functionally complete
Diffstat (limited to 'node-repository')
2 files changed, 5 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java index fbcc897ca81..715aaf8680e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Maintainer.java @@ -31,8 +31,8 @@ public abstract class Maintainer extends AbstractComponent implements Runnable { this.interval = interval; this.jobControl = jobControl; - this.service = new ScheduledThreadPoolExecutor(1); - this.service.scheduleAtFixedRate(this, interval.toMillis(), interval.toMillis(), TimeUnit.MILLISECONDS); + service = new ScheduledThreadPoolExecutor(1); + service.scheduleAtFixedRate(this, interval.toMillis(), interval.toMillis(), TimeUnit.MILLISECONDS); jobControl.started(name()); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/OrchestratorMock.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/OrchestratorMock.java index 3de5278cd41..1e6f98f4ec6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/OrchestratorMock.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/OrchestratorMock.java @@ -13,6 +13,7 @@ import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus; import com.yahoo.vespa.orchestrator.status.HostStatus; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -43,7 +44,7 @@ public class OrchestratorMock implements Orchestrator { @Override public Set<ApplicationId> getAllSuspendedApplications() { - return null; + return Collections.unmodifiableSet(suspendedApplications); } @Override @@ -58,7 +59,7 @@ public class OrchestratorMock implements Orchestrator { @Override public void suspendAll(HostName parentHostname, List<HostName> hostNames) throws BatchInternalErrorException, BatchHostStateChangeDeniedException, BatchHostNameNotFoundException { - throw new RuntimeException("Not implemented"); + throw new UnsupportedOperationException("Not implemented"); } } |