GC load metrics take 2

3 files changed, 7 insertions, 14 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 8427f882cfb..5a7a598fb4c 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -326,9 +326,8 @@ FileStorHandlerImpl::updateMetrics(const MetricLockGuard &)
     _metrics->pendingMerges.addValue(_mergeStates.size());
     _metrics->queueSize.addValue(getQueueSize());
 
-    metrics::LoadType loadType(0, "ignored");
     for (const auto & stripe : _metrics->stripes) {
-        const auto & m = stripe->averageQueueWaitingTime[loadType];
+        const auto & m = stripe->averageQueueWaitingTime;
         _metrics->averageQueueWaitingTime.addTotalValueWithCount(m.getTotal(), m.getCount());
     }
 }
@@ -943,8 +942,7 @@ FileStorHandlerImpl::Stripe::get_next_async_message(monitor_guard& guard)
 FileStorHandler::LockedMessage
 FileStorHandlerImpl::Stripe::getMessage(monitor_guard & guard, PriorityIdx & idx, PriorityIdx::iterator iter) {
 
-    api::StorageMessage & m(*iter->_command);
-    std::chrono::milliseconds waitTime(uint64_t(iter->_timer.stop(_metrics->averageQueueWaitingTime[m.getLoadType()])));
+    std::chrono::milliseconds waitTime(uint64_t(iter->_timer.stop(_metrics->averageQueueWaitingTime)));
 
     std::shared_ptr<api::StorageMessage> msg = std::move(iter->_command);
     document::Bucket bucket(iter->_bucket);
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
index a3265b82410..996e3bfe515 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
@@ -189,13 +189,9 @@ FileStorThreadMetrics::FileStorThreadMetrics(const std::string& name, const std:
 
 FileStorThreadMetrics::~FileStorThreadMetrics() = default;
 
-FileStorStripeMetrics::FileStorStripeMetrics(const std::string& name, const std::string& description,
-                                             const LoadTypeSet& loadTypes)
+FileStorStripeMetrics::FileStorStripeMetrics(const std::string& name, const std::string& description)
     : MetricSet(name, {{"partofsum"}}, description),
-      averageQueueWaitingTime(loadTypes,
-                              metrics::DoubleAverageMetric("averagequeuewait", {},
-                                                           "Average time an operation spends in input queue."),
-                              this)
+      averageQueueWaitingTime("averagequeuewait", {}, "Average time an operation spends in input queue.", this)
 {
 }
 
@@ -240,7 +236,7 @@ FileStorDiskMetrics::initDiskMetrics(const LoadTypeSet& loadTypes, uint32_t numS
         std::ostringstream name;
         name << "stripe" << i;
         desc << "Stripe " << i << '/' << numStripes;
-        stripes[i] = std::make_shared<FileStorStripeMetrics>(name.str(), desc.str(), loadTypes);
+        stripes[i] = std::make_shared<FileStorStripeMetrics>(name.str(), desc.str());
         registerMetric(*stripes[i]);
         sumStripes.addMetricToSum(*stripes[i]);
     }
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index e893765fbd8..aecbfc1ae2b 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -129,9 +129,8 @@ class FileStorStripeMetrics : public metrics::MetricSet
 {
 public:
     using SP = std::shared_ptr<FileStorStripeMetrics>;
-    metrics::LoadMetric<metrics::DoubleAverageMetric> averageQueueWaitingTime;
-    FileStorStripeMetrics(const std::string& name, const std::string& description,
-                          const metrics::LoadTypeSet& loadTypes);
+    metrics::DoubleAverageMetric averageQueueWaitingTime;
+    FileStorStripeMetrics(const std::string& name, const std::string& description);
     ~FileStorStripeMetrics() override;
 };