summaryrefslogtreecommitdiffstats
path: root/metrics/src
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2023-08-29 13:22:01 +0000
committerTor Brede Vekterli <vekterli@yahooinc.com>2023-08-29 13:22:01 +0000
commit0ee50412c84796b2991902545d3841ea6007ec2c (patch)
tree86b22d7cc0ec620cecacdba6e5b512e5f5758b80 /metrics/src
parent8089a9a696cafede455a25c3e37432bf24845790 (diff)
Let `any_snapshots_taken()` be well-defined prior to metric manager init
Diffstat (limited to 'metrics/src')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp1
-rw-r--r--metrics/src/vespa/metrics/metricmanager.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index f655d6c210e..a6dd141576f 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -462,6 +462,7 @@ TEST_F(MetricManagerTest, test_snapshots)
{
MetricLockGuard lockGuard(mm.getMetricLock());
mm.registerMetric(lockGuard, mySet.set);
+ EXPECT_FALSE(mm.any_snapshots_taken(lockGuard)); // well-defined prior to init()
}
mm.init(ConfigUri("raw:"
"consumer[2]\n"
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index f3635f72c08..fa18ddc383b 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -170,8 +170,7 @@ MetricManager::isInitialized() const {
bool
MetricManager::any_snapshots_taken(const MetricLockGuard&) const noexcept {
- assert(!_snapshots.empty());
- return _snapshots[0]->current_is_assigned();
+ return (!_snapshots.empty() && _snapshots[0]->current_is_assigned());
}
void