diff options
4 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java index 7c95125c6c3..5938925e9bc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java @@ -29,7 +29,7 @@ public class TrafficShareUpdater extends ControllerMaintainer { private final NodeRepository nodeRepository; public TrafficShareUpdater(Controller controller, Duration duration) { - super(controller, duration, DeploymentMetricsMaintainer.class.getSimpleName(), SystemName.all()); + super(controller, duration, TrafficShareUpdater.class.getSimpleName(), SystemName.all()); this.applications = controller.applications(); this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository(); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json index f8ae1cfefa0..245e8cbebfe 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json @@ -73,6 +73,9 @@ "name": "SystemUpgrader" }, { + "name": "TrafficShareUpdater" + }, + { "name": "Upgrader" }, { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java index 03e33b97677..6ea77554012 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java @@ -12,10 +12,8 @@ import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.orchestrator.Orchestrator; -import java.time.DayOfWeek; import java.time.Duration; import java.time.ZonedDateTime; -import java.util.Date; import java.util.List; import java.util.Set; import java.util.logging.Level; diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index e003aa39f7b..113669b2e76 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java @@ -20,8 +20,7 @@ import java.util.logging.Logger; */ class VespaQuorumPeer extends QuorumPeerMain implements QuorumPeer { - private static final Logger log = java.util.logging.Logger.getLogger(Reconfigurer.class.getName()); - private static final Duration timeToWaitForShutdown = Duration.ofSeconds(60); + private static final Logger log = java.util.logging.Logger.getLogger(VespaQuorumPeer.class.getName()); @Override public void start(Path path) { |