diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-24 22:21:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-24 22:21:34 +0200 |
| commit | dc28d930dbd43b12a5a8e03dd36920c86b58458e (patch) | |
| tree | 51a5b567c3fbafda481c86cc3ea986e87b4ec402 | |
| parent | 30e050f52399200e32f44e50326deb43fb762f31 (diff) | |
| parent | 9805f65f3353197d8ab936ab3f00c587b66ba09e (diff) | |
Merge pull request #19711 from vespa-engine/balder/add-util-metricsv7.488.67
Add metrics for thread utilization
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 4 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index d8c59ebda65..a65e6fe16c0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -371,6 +371,10 @@ public class VespaMetricSet { metrics.add(new Metric(prefix + ".queuesize.count")); metrics.add(new Metric(prefix + ".maxpending.last")); // TODO: Remove in Vespa 8 metrics.add(new Metric(prefix + ".accepted.rate")); + metrics.add(new Metric(prefix + ".wakeups.rate")); + metrics.add(new Metric(prefix + ".utilization.max")); + metrics.add(new Metric(prefix + ".utilization.sum")); + metrics.add(new Metric(prefix + ".utilization.count")); } private static Set<Metric> getSearchNodeMetrics() { diff --git a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp index 3c98857242f..406432ef697 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp +++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp @@ -21,7 +21,7 @@ ExecutorMetrics::ExecutorMetrics(const std::string &name, metrics::MetricSet *pa maxPending("maxpending", {}, "Maximum number of pending (active + queued) tasks", this), accepted("accepted", {}, "Number of accepted tasks", this), rejected("rejected", {}, "Number of rejected tasks", this), - wakeupCount("wakeupCount", {}, "Number of times a worker thread has been woken up", this), + wakeupCount("wakeups", {}, "Number of times a worker thread has been woken up", this), util("utilization", {}, "Ratio of time the worker threads has been active", this), queueSize("queuesize", {}, "Size of task queue", this) { |