aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-07-08 13:21:59 +0200
committerMartin Polden <mpolden@mpolden.no>2020-07-08 13:21:59 +0200
commita9582ea01ea1da9ba70c64a67ea285c68581bbe9 (patch)
tree38fb3c44460e431a441862a14f8f1f7987439133 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
parent550d57e908feab278830c80f3ba6b4084b3f8c2f (diff)
Reduce logging from ResourceMeterMaintainer
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java13
1 files changed, 12 insertions, 1 deletions
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 d57d6ff0976..76a186a2f6b 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
@@ -11,6 +11,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
import com.yahoo.vespa.hosted.controller.api.integration.resource.MeteringClient;
import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapshot;
+import com.yahoo.yolean.Exceptions;
import java.time.Clock;
import java.time.Duration;
@@ -18,10 +19,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import java.util.logging.Level;
import java.util.stream.Collectors;
/**
- * Creates a ResourceSnapshot per application, which is then passed on to a MeteringClient
+ * Creates a {@link ResourceSnapshot} per application, which is then passed on to a MeteringClient
*
* @author olaa
*/
@@ -49,7 +51,15 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
@Override
protected void maintain() {
+ try {
+ collectResourceSnapshots();
+ } catch (Exception e) {
+ log.log(Level.WARNING, "Failed to collect resource snapshots. Retrying in " + interval() + ". Error: " +
+ Exceptions.toMessageString(e));
+ }
+ }
+ private void collectResourceSnapshots() {
Collection<ResourceSnapshot> resourceSnapshots = getAllResourceSnapshots();
meteringClient.consume(resourceSnapshots);
@@ -104,4 +114,5 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
private boolean isNodeStateMeterable(Node node) {
return METERABLE_NODE_STATES.contains(node.state());
}
+
}