diff options
7 files changed, 64 insertions, 110 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringData.java deleted file mode 100644 index 59ea8440701..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringData.java +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.integration.resource; - -import com.yahoo.config.provision.ApplicationId; - -import java.util.List; -import java.util.Map; - -/** - * @author olaa - */ -public class MeteringData { - - private final ResourceAllocation thisMonth; - private final ResourceAllocation lastMonth; - private final ResourceAllocation currentSnapshot; - Map<ApplicationId, List<ResourceSnapshot>> snapshotHistory; - - public MeteringData(ResourceAllocation thisMonth, ResourceAllocation lastMonth, ResourceAllocation currentSnapshot, Map<ApplicationId, List<ResourceSnapshot>> snapshotHistory) { - this.thisMonth = thisMonth; - this.lastMonth = lastMonth; - this.currentSnapshot = currentSnapshot; - this.snapshotHistory = snapshotHistory; - } - - public ResourceAllocation getThisMonth() { - return thisMonth; - } - - public ResourceAllocation getLastMonth() { - return lastMonth; - } - - public ResourceAllocation getCurrentSnapshot() { - return currentSnapshot; - } - - public Map<ApplicationId, List<ResourceSnapshot>> getSnapshotHistory() { - return snapshotHistory; - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java index d04d400d36f..c1d210e990d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java @@ -78,11 +78,11 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient { a.getApplicationId(), a.getZoneId(), plan, - a.getArchitecture(), + a.resources().architecture(), a.getVersion().getMajor(), - BigDecimal.valueOf(a.getCpuCores()).multiply(d), - BigDecimal.valueOf(a.getMemoryGb()).multiply(d), - BigDecimal.valueOf(a.getDiskGb()).multiply(d) + BigDecimal.valueOf(a.resources().vcpu()).multiply(d), + BigDecimal.valueOf(a.resources().memoryGb()).multiply(d), + BigDecimal.valueOf(a.resources().diskGb()).multiply(d) ); }) .toList(); @@ -114,7 +114,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient { .filter(snapshot -> snapshot.getTimestamp().isBefore(Instant.ofEpochMilli(end))) .filter(snapshot -> snapshot.getApplicationId().tenant().equals(tenantName)) .collect(Collectors.groupingBy( - usage -> Objects.hash(usage.getApplicationId(), usage.getZoneId(), tenantPlan.id().value(), usage.getArchitecture(), usage.getVersion().getMajor()) + usage -> Objects.hash(usage.getApplicationId(), usage.getZoneId(), tenantPlan.id().value(), usage.resources().architecture(), usage.getVersion().getMajor()) )) .values().stream() .map(snapshots -> resourceUsageFromSnapshots(tenantPlan, snapshots)) diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java index 4ff79706683..4a849b831b7 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java @@ -21,21 +21,21 @@ import java.util.stream.Collectors; public class ResourceSnapshot { private final ApplicationId applicationId; - private final ResourceAllocation resourceAllocation; + private final NodeResources resources; private final Instant timestamp; private final ZoneId zoneId; private final Version version; - public ResourceSnapshot(ApplicationId applicationId, double cpuCores, double memoryGb, double diskGb, NodeResources.Architecture architecture, Instant timestamp, ZoneId zoneId, Version version) { + public ResourceSnapshot(ApplicationId applicationId, NodeResources resources, Instant timestamp, ZoneId zoneId, Version version) { this.applicationId = applicationId; - this.resourceAllocation = new ResourceAllocation(cpuCores, memoryGb, diskGb, architecture); + this.resources = resources; this.timestamp = timestamp; this.zoneId = zoneId; this.version = version; } - public static ResourceSnapshot from(ApplicationId applicationId, int nodes, double cpuCores, double memoryGb, double diskGb, NodeResources.Architecture architecture, Instant timestamp, ZoneId zoneId) { - return new ResourceSnapshot(applicationId, cpuCores * nodes, memoryGb * nodes, diskGb * nodes, architecture, timestamp, zoneId, Version.emptyVersion); + public static ResourceSnapshot from(ApplicationId applicationId, int nodes, NodeResources resources, Instant timestamp, ZoneId zoneId) { + return new ResourceSnapshot(applicationId, resources.multipliedBy(nodes), timestamp, zoneId, Version.emptyVersion); } public static ResourceSnapshot from(List<Node> nodes, Instant timestamp, ZoneId zoneId) { @@ -44,38 +44,26 @@ public class ResourceSnapshot { .map(node -> node.owner().get()) .collect(Collectors.toSet()); + Set<Version> versions = nodes.stream() + .map(Node::currentVersion) + .collect(Collectors.toSet()); + if (applicationIds.size() != 1) throw new IllegalArgumentException("List of nodes can only represent one application"); + if (versions.size() != 1) throw new IllegalArgumentException("List of nodes can only represent one version"); + + var resources = nodes.stream() + .map(Node::resources) + .reduce(NodeResources.zero(), NodeResources::add); - return new ResourceSnapshot( - applicationIds.iterator().next(), - nodes.stream().map(Node::resources).mapToDouble(NodeResources::vcpu).sum(), - nodes.stream().map(Node::resources).mapToDouble(NodeResources::memoryGb).sum(), - nodes.stream().map(Node::resources).mapToDouble(NodeResources::diskGb).sum(), - nodes.stream().map(node -> node.resources().architecture()).findFirst().orElse(NodeResources.Architecture.getDefault()), - timestamp, - zoneId, - nodes.stream().map(Node::currentVersion).min(Version::compareTo).orElse(Version.emptyVersion) - ); + return new ResourceSnapshot(applicationIds.iterator().next(), resources, timestamp, zoneId, versions.iterator().next()); } public ApplicationId getApplicationId() { return applicationId; } - public ResourceAllocation allocation() { - return resourceAllocation; - } - - public double getCpuCores() { - return resourceAllocation.getCpuCores(); - } - - public double getMemoryGb() { - return resourceAllocation.getMemoryGb(); - } - - public double getDiskGb() { - return resourceAllocation.getDiskGb(); + public NodeResources resources() { + return resources; } public Instant getTimestamp() { @@ -90,10 +78,6 @@ public class ResourceSnapshot { return version; } - public NodeResources.Architecture getArchitecture() { - return resourceAllocation.getArchitecture(); - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -101,7 +85,7 @@ public class ResourceSnapshot { ResourceSnapshot other = (ResourceSnapshot) o; return this.applicationId.equals(other.applicationId) && - this.resourceAllocation.equals(other.resourceAllocation) && + this.resources.equals(other.resources) && this.timestamp.equals(other.timestamp) && this.zoneId.equals(other.zoneId) && this.version.equals(other.version); @@ -109,6 +93,6 @@ public class ResourceSnapshot { @Override public int hashCode(){ - return Objects.hash(applicationId, resourceAllocation, timestamp, zoneId, version); + return Objects.hash(applicationId, resources, timestamp, zoneId, version); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java index d47b82a231f..059986072f3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java @@ -120,7 +120,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { Map<ZoneId, Double> deploymentCosts = snapshotsByInstance.getOrDefault(instanceName, List.of()).stream() .collect(Collectors.toUnmodifiableMap( ResourceSnapshot::getZoneId, - snapshot -> cost(snapshot.allocation(), systemName), + snapshot -> cost(snapshot.resources(), systemName), Double::sum)); locked = locked.with(instanceName, i -> i.withDeploymentCosts(deploymentCosts)); updateCostMetrics(tenantAndApplication.instance(instanceName), deploymentCosts); @@ -234,10 +234,14 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { } private static double cost(ResourceAllocation allocation, SystemName systemName) { + var resources = new NodeResources(allocation.getCpuCores(), allocation.getMemoryGb(), allocation.getDiskGb(), 0); + return cost(resources, systemName); + } + + private static double cost(NodeResources resources, SystemName systemName) { // Divide cost by 3 in non-public zones to show approx. AWS equivalent cost double costDivisor = systemName.isPublic() ? 1.0 : 3.0; - double cost = new NodeResources(allocation.getCpuCores(), allocation.getMemoryGb(), allocation.getDiskGb(), 0).cost(); - return Math.round(cost * 100.0 / costDivisor) / 100.0; + return Math.round(resources.cost() * 100.0 / costDivisor) / 100.0; } private void updateMeteringMetrics(Collection<ResourceSnapshot> resourceSnapshots) { @@ -245,14 +249,14 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { // total metered resource usage, for alerting on drastic changes metric.set(METERING_TOTAL_REPORTED, resourceSnapshots.stream() - .mapToDouble(r -> r.getCpuCores() + r.getMemoryGb() + r.getDiskGb()).sum(), + .mapToDouble(r -> r.resources().vcpu() + r.resources().memoryGb() + r.resources().diskGb()).sum(), metric.createContext(Collections.emptyMap())); resourceSnapshots.forEach(snapshot -> { var context = getMetricContext(snapshot); - metric.set("metering.vcpu", snapshot.getCpuCores(), context); - metric.set("metering.memoryGB", snapshot.getMemoryGb(), context); - metric.set("metering.diskGB", snapshot.getDiskGb(), context); + metric.set("metering.vcpu", snapshot.resources().vcpu(), context); + metric.set("metering.memoryGB", snapshot.resources().memoryGb(), context); + metric.set("metering.diskGB", snapshot.resources().diskGb(), context); }); } @@ -276,7 +280,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer { "tenant", snapshot.getApplicationId().tenant().value(), "applicationId", snapshot.getApplicationId().toFullString(), "zoneId", snapshot.getZoneId().value(), - "architecture", snapshot.getArchitecture() + "architecture", snapshot.resources().architecture() )); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java index 17461aafd02..7df216d6c9c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java @@ -29,10 +29,10 @@ public class MeteringResponse extends SlimeJsonResponse { object.setString("applicationId", snapshot.getApplicationId().toShortString()); object.setLong("timestamp", snapshot.getTimestamp().toEpochMilli()); object.setString("zoneId", snapshot.getZoneId().value()); - object.setDouble("cpu", snapshot.getCpuCores()); - object.setDouble("memory", snapshot.getMemoryGb()); - object.setDouble("disk", snapshot.getDiskGb()); - object.setString("architecture", snapshot.getArchitecture().name()); + object.setDouble("cpu", snapshot.resources().vcpu()); + object.setDouble("memory", snapshot.resources().memoryGb()); + object.setDouble("disk", snapshot.resources().diskGb()); + object.setString("architecture", snapshot.resources().architecture().name()); }); return slime; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java index cecf0b1a2cf..3034c93e593 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java @@ -61,18 +61,20 @@ public class ResourceMeterMaintainerTest { .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().cost().getAsDouble()))); List<ResourceSnapshot> resourceSnapshots = List.of( - new ResourceSnapshot(app1, 12, 34, 56, NodeResources.Architecture.getDefault(), Instant.EPOCH, z1, Version.emptyVersion), - new ResourceSnapshot(app1, 23, 45, 67, NodeResources.Architecture.getDefault(), Instant.EPOCH, z2, Version.emptyVersion), - new ResourceSnapshot(app2, 34, 56, 78, NodeResources.Architecture.getDefault(), Instant.EPOCH, z1, Version.emptyVersion)); + new ResourceSnapshot(app1, resources(12, 34, 56), Instant.EPOCH, z1, Version.emptyVersion), + new ResourceSnapshot(app1, resources(23, 45, 67), Instant.EPOCH, z2, Version.emptyVersion), + new ResourceSnapshot(app2, resources(34, 56, 78), Instant.EPOCH, z1, Version.emptyVersion)); + maintainer.updateDeploymentCost(resourceSnapshots); assertCost.accept(app1, Map.of(z1, 1.72, z2, 3.05)); assertCost.accept(app2, Map.of(z1, 4.39)); // Remove a region from app1 and add region to app2 resourceSnapshots = List.of( - new ResourceSnapshot(app1, 23, 45, 67, NodeResources.Architecture.getDefault(), Instant.EPOCH, z2, Version.emptyVersion), - new ResourceSnapshot(app2, 34, 56, 78, NodeResources.Architecture.getDefault(), Instant.EPOCH, z1, Version.emptyVersion), - new ResourceSnapshot(app2, 45, 67, 89, NodeResources.Architecture.getDefault(), Instant.EPOCH, z2, Version.emptyVersion)); + new ResourceSnapshot(app1, resources(23, 45, 67), Instant.EPOCH, z2, Version.emptyVersion), + new ResourceSnapshot(app2, resources(34, 56, 78), Instant.EPOCH, z1, Version.emptyVersion), + new ResourceSnapshot(app2, resources(45, 67, 89), Instant.EPOCH, z2, Version.emptyVersion)); + maintainer.updateDeploymentCost(resourceSnapshots); assertCost.accept(app1, Map.of(z2, 3.05)); assertCost.accept(app2, Map.of(z1, 4.39, z2, 5.72)); @@ -97,13 +99,13 @@ public class ResourceMeterMaintainerTest { ResourceSnapshot app1 = consumedResources.stream().filter(snapshot -> snapshot.getApplicationId().equals(ApplicationId.from("tenant1", "app1", "default"))).findFirst().orElseThrow(); ResourceSnapshot app2 = consumedResources.stream().filter(snapshot -> snapshot.getApplicationId().equals(ApplicationId.from("tenant2", "app2", "default"))).findFirst().orElseThrow(); - assertEquals(24, app1.getCpuCores(), Double.MIN_VALUE); - assertEquals(24, app1.getMemoryGb(), Double.MIN_VALUE); - assertEquals(500, app1.getDiskGb(), Double.MIN_VALUE); + assertEquals(24, app1.resources().vcpu(), Double.MIN_VALUE); + assertEquals(24, app1.resources().memoryGb(), Double.MIN_VALUE); + assertEquals(500, app1.resources().diskGb(), Double.MIN_VALUE); - assertEquals(40, app2.getCpuCores(), Double.MIN_VALUE); - assertEquals(24, app2.getMemoryGb(), Double.MIN_VALUE); - assertEquals(500, app2.getDiskGb(), Double.MIN_VALUE); + assertEquals(40, app2.resources().vcpu(), Double.MIN_VALUE); + assertEquals(24, app2.resources().memoryGb(), Double.MIN_VALUE); + assertEquals(500, app2.resources().diskGb(), Double.MIN_VALUE); assertEquals(tester.clock().millis() / 1000, metrics.getMetric("metering_last_reported")); assertEquals(2224.0d, (Double) metrics.getMetric("metering_total_reported"), Double.MIN_VALUE); @@ -154,4 +156,8 @@ public class ResourceMeterMaintainerTest { .build()) .toList(); } + + private NodeResources resources(double cpu, double ram, double disk) { + return new NodeResources(cpu, ram, disk, 0, NodeResources.DiskSpeed.getDefault(), NodeResources.StorageType.getDefault(), NodeResources.Architecture.getDefault(), NodeResources.GpuResources.getDefault()); + } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java index 9adfc83da5c..ac7287b7e27 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java @@ -158,10 +158,12 @@ public class ControllerApiTest extends ControllerContainerTest { ApplicationId applicationId = ApplicationId.from("tenant", "app", "instance"); Instant timestamp = Instant.ofEpochMilli(123456789); ZoneId zoneId = ZoneId.defaultId(); - List<ResourceSnapshot> snapshots = List.of( - new ResourceSnapshot(applicationId, 12, 48, 1200, NodeResources.Architecture.arm64, timestamp, zoneId, Version.emptyVersion), - new ResourceSnapshot(applicationId, 24, 96, 2400, NodeResources.Architecture.x86_64, timestamp, zoneId, Version.emptyVersion) - ); + var resources = List.of( + new NodeResources(12, 48, 1200, 0, NodeResources.DiskSpeed.any, NodeResources.StorageType.any, NodeResources.Architecture.arm64), + new NodeResources(24, 96, 2400, 0, NodeResources.DiskSpeed.any, NodeResources.StorageType.any, NodeResources.Architecture.x86_64)); + + var snapshots = resources.stream().map(x -> new ResourceSnapshot(applicationId, x, timestamp, zoneId, Version.emptyVersion)).toList(); + tester.controller().serviceRegistry().resourceDatabase().writeResourceSnapshots(snapshots); tester.assertResponse( operatorRequest("http://localhost:8080/controller/v1/metering/tenant/tenantName/month/2020-02", "", Request.Method.GET), |