- Update metrics less often by removing the forceEventLogging alltogether.

- Let default bucket iteration work in smaller chunks with shorter waits.

2 files changed, 1 insertions, 4 deletions

diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index fd398f6d7d7..7ac912416de 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -74,7 +74,6 @@ MetricManager::MetricManager(std::unique_ptr<Timer> timer)
                 false)),
       _timer(std::move(timer)),
       _lastProcessedTime(0),
-      _forceEventLogging(false),
       _snapshotUnsetMetrics(false),
       _consumerConfigChanged(false),
       _metricManagerMetrics("metricmanager", {}, "Metrics for the metric manager upkeep tasks"),
@@ -719,7 +718,6 @@ MetricManager::forceEventLogging()
     LOG(debug, "Forcing event logging to happen.");
         // Ensure background thread is not in a current cycle during change.
     vespalib::MonitorGuard sync(_waiter);
-    _forceEventLogging = true;
     sync.signal();
 }
 
@@ -788,7 +786,7 @@ MetricManager::tick(const MetricLockGuard & guard, time_t currentTime)
         // Set next work time to the time we want to take next snapshot.
     time_t nextWorkTime = _snapshots[0]->getToTime() + _snapshots[0]->getPeriod();
     time_t nextUpdateHookTime;
-    if (nextWorkTime <= currentTime || _forceEventLogging) {
+    if (nextWorkTime <= currentTime) {
         // If taking a new snapshot or logging, force calls to all
         // update hooks.
         LOG(debug, "%s. Calling update hooks.", nextWorkTime <= currentTime
diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h
index b728510b6e4..6d1f8f4dcf7 100644
--- a/metrics/src/vespa/metrics/metricmanager.h
+++ b/metrics/src/vespa/metrics/metricmanager.h
@@ -111,7 +111,6 @@ private:
     MetricSnapshot::SP _totalMetrics;
     std::unique_ptr<Timer> _timer;
     std::atomic<time_t> _lastProcessedTime;
-    bool _forceEventLogging;
     // Should be added to config, but wont now due to problems with
     // upgrading
     bool _snapshotUnsetMetrics;