diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-23 15:26:14 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-23 15:26:14 +0100 |
commit | 827acc9bd417915b6883b53921c8ec1a74266940 (patch) | |
tree | 908fac660f77de2dbd4582e6ad14d155200e00d4 /node-repository | |
parent | 3cff13b95c77104725fd61f4b5acb78113c87f16 (diff) |
Nonfunctional changes only
Diffstat (limited to 'node-repository')
3 files changed, 7 insertions, 8 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java index 3617a632f04..c54c2c543a6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java @@ -16,7 +16,7 @@ import java.util.Random; /** * This schedules periodic reboot of all nodes. * We reboot nodes periodically to surface problems at reboot with a smooth frequency rather than - * potentially in burst when many bodes need to be rebooted for external reasons. + * potentially in burst when many nodes need to be rebooted for external reasons. * * @author bratseth */ @@ -30,17 +30,16 @@ public class NodeRebooter extends Maintainer { super(nodeRepository, min(Duration.ofMinutes(25), rebootInterval)); this.rebootInterval = rebootInterval; this.clock = clock; - random = new Random(clock.millis()); // seed with clock for test determinism - + this.random = new Random(clock.millis()); // seed with clock for test determinism } @Override protected void maintain() { // Reboot candidates: Nodes in long-term states, which we know an safely orchestrate a reboot - List<Node> rebootCanididates = nodeRepository().getNodes(NodeType.tenant, Node.State.active, Node.State.ready); - rebootCanididates.addAll(nodeRepository().getNodes(NodeType.proxy, Node.State.active, Node.State.ready)); + List<Node> rebootCandidates = nodeRepository().getNodes(NodeType.tenant, Node.State.active, Node.State.ready); + rebootCandidates.addAll(nodeRepository().getNodes(NodeType.proxy, Node.State.active, Node.State.ready)); - for (Node node : rebootCanididates) { + for (Node node : rebootCandidates) { if (shouldReboot(node)) nodeRepository().reboot(NodeListFilter.from(node)); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java index a96315257e2..9bbc6fcde2d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java @@ -101,7 +101,7 @@ public class History { private final Instant at; private final Event.Type type; - + public Event(Event.Type type, Instant at) { this.type = type; this.at = at; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainerTest.java index 6a195b9812d..a722071370f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ApplicationMaintainerTest.java @@ -47,7 +47,7 @@ public class ApplicationMaintainerTest { ManualClock clock = new ManualClock(); Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); - NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, + NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup()); createReadyNodes(15, nodeRepository, nodeFlavors); |