ResourceMeterMaintainer refreshes metering at set intervals (#15688)

2 files changed, 12 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringClient.java
index 1047e1a02a4..e8c7a9a1654 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/MeteringClient.java
@@ -21,4 +21,6 @@ public interface MeteringClient {
 
     List<ResourceSnapshot> getSnapshotHistoryForTenant(TenantName tenantName, YearMonth yearMonth);
 
+    void refresh();
+
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMeteringClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMeteringClient.java
index ec3f564e930..6ccab4f60fe 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMeteringClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMeteringClient.java
@@ -24,6 +24,7 @@ public class MockMeteringClient implements MeteringClient {
 
     private Collection<ResourceSnapshot> resources = new ArrayList<>();
     private Optional<MeteringData> meteringData;
+    private boolean isRefreshed = false;
 
     @Override
     public void consume(Collection<ResourceSnapshot> resources){
@@ -43,6 +44,11 @@ public class MockMeteringClient implements MeteringClient {
         return new ArrayList<>(resources);
     }
 
+    @Override
+    public void refresh() {
+        isRefreshed = true;
+    }
+
     public Collection<ResourceSnapshot> consumedResources() {
         return this.resources;
     }
@@ -51,4 +57,8 @@ public class MockMeteringClient implements MeteringClient {
         this.meteringData = Optional.of(meteringData);
         this.resources = meteringData.getSnapshotHistory().entrySet().stream().map(Map.Entry::getValue).flatMap(List::stream).collect(Collectors.toList());
     }
+
+    public boolean isRefreshed() {
+        return isRefreshed;
+    }
 }