diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-02-18 17:58:46 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-02-18 17:58:46 +0100 |
commit | 79d9ae7cc3eb7052cce5e40ea83874d312cf5012 (patch) | |
tree | 965cd6af495fc5cf12193fc20ef032f2ea222126 /controller-server/src/main/java/com | |
parent | b6416d4e35daf38d15e038c0ac3d47b84ff38436 (diff) |
Better names
Diffstat (limited to 'controller-server/src/main/java/com')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java | 2 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficFractionUpdater.java) | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java index 2d9bd3639c5..f7ab4d30088 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java @@ -64,7 +64,7 @@ public class ControllerMaintenance extends AbstractComponent { maintainers.add(new HostSwitchUpdater(controller, intervals.hostSwitchUpdater)); maintainers.add(new ReindexingTriggerer(controller, intervals.reindexingTriggerer)); maintainers.add(new EndpointCertificateMaintainer(controller, intervals.endpointCertificateMaintainer)); - maintainers.add(new TrafficFractionUpdater(controller, intervals.trafficFractionUpdater)); + maintainers.add(new TrafficShareUpdater(controller, intervals.trafficFractionUpdater)); } public Upgrader upgrader() { return upgrader; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficFractionUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java index 8656db55aed..7c95125c6c3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficFractionUpdater.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java @@ -23,12 +23,12 @@ import java.time.Duration; * * @author bratseth */ -public class TrafficFractionUpdater extends ControllerMaintainer { +public class TrafficShareUpdater extends ControllerMaintainer { private final ApplicationController applications; private final NodeRepository nodeRepository; - public TrafficFractionUpdater(Controller controller, Duration duration) { + public TrafficShareUpdater(Controller controller, Duration duration) { super(controller, duration, DeploymentMetricsMaintainer.class.getSimpleName(), SystemName.all()); this.applications = controller.applications(); this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository(); @@ -55,12 +55,12 @@ public class TrafficFractionUpdater extends ControllerMaintainer { long prodRegions = instance.deployments().values().stream() .filter(i -> i.zone().environment().isProduction()) .count(); - double currentTrafficFraction = totalQps == 0 ? 0 : qpsInZone / totalQps; - double maxTrafficFraction = prodRegions < 2 ? 1.0 : 1.0 / ( prodRegions - 1.0); - if (currentTrafficFraction > maxTrafficFraction) // This can happen because the assumption of equal traffic - maxTrafficFraction = currentTrafficFraction; // distribution can be incorrect + double currentReadShare = totalQps == 0 ? 0 : qpsInZone / totalQps; + double maxReadShare = prodRegions < 2 ? 1.0 : 1.0 / ( prodRegions - 1.0); + if (currentReadShare > maxReadShare) // This can happen because the assumption of equal traffic + maxReadShare = currentReadShare; // distribution can be incorrect - nodeRepository.patchApplication(deployment.zone(), instance.id(), currentTrafficFraction, maxTrafficFraction); + nodeRepository.patchApplication(deployment.zone(), instance.id(), currentReadShare, maxReadShare); } } |