Better names

4 files changed, 15 insertions, 15 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);
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index 7f9f70a373b..3961107848e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -187,8 +187,8 @@ public class NodeRepositoryMock implements NodeRepository {
 
     @Override
     public void setTrafficFraction(ZoneId zone, ApplicationId application,
-                                   double currentTrafficFraction, double maxTrafficFraction) {
-        trafficFractions.put(new DeploymentId(application, zone), new Pair<>(currentTrafficFraction, maxTrafficFraction));
+                                   double currentReadShare, double maxReadShare) {
+        trafficFractions.put(new DeploymentId(application, zone), new Pair<>(currentReadShare, maxReadShare));
     }
 
     @Override
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficFractionUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java
index 9077707f4d0..2674e155b98 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficFractionUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java
@@ -21,14 +21,14 @@ import static org.junit.Assert.assertEquals;
  *
  * @author bratseth
  */
-public class TrafficFractionUpdaterTest {
+public class TrafficShareUpdaterTest {
 
     @Test
     public void testTrafficUpdater() {
         DeploymentTester tester = new DeploymentTester();
         var application = tester.newDeploymentContext();
         var deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(tester.controller(), Duration.ofDays(1));
-        var updater = new TrafficFractionUpdater(tester.controller(), Duration.ofDays(1));
+        var updater = new TrafficShareUpdater(tester.controller(), Duration.ofDays(1));
         ZoneId prod1 = ZoneId.from("prod", "ap-northeast-1");
         ZoneId prod2 = ZoneId.from("prod", "us-east-3");
         ZoneId prod3 = ZoneId.from("prod", "us-west-1");
@@ -85,11 +85,11 @@ public class TrafficFractionUpdaterTest {
         tester.controllerTester().serviceRegistry().configServerMock().setMetrics(new DeploymentId(application, zone), clusterMetrics);
     }
 
-    private void assertTrafficFraction(double currentTrafficFraction, double maxTrafficFraction,
+    private void assertTrafficFraction(double currentReadShare, double maxReadShare,
                                        ApplicationId application, ZoneId zone, DeploymentTester tester) {
         NodeRepositoryMock mock = (NodeRepositoryMock)tester.controller().serviceRegistry().configServer().nodeRepository();
-        assertEquals(currentTrafficFraction, mock.getTrafficFraction(application, zone).getFirst(), 0.00001);
-        assertEquals(maxTrafficFraction, mock.getTrafficFraction(application, zone).getSecond(), 0.00001);
+        assertEquals(currentReadShare, mock.getTrafficFraction(application, zone).getFirst(), 0.00001);
+        assertEquals(maxReadShare, mock.getTrafficFraction(application, zone).getSecond(), 0.00001);
     }
 
 }