summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-29 19:35:26 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-12-12 02:55:40 +0100
commit97cff7808649426865e0275f1c24058dbfd65940 (patch)
treec47d45fd7e78c3444ba41c5b9ac63cf99dd9d1f7 /storage
parent6017ac8ab420a95a556ea6693438dada4fbe436c (diff)
Add necessary includes.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/tests/common/metricstest.cpp2
-rw-r--r--storage/src/tests/distributor/distributortest.cpp2
-rw-r--r--storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp1
-rw-r--r--storage/src/tests/storageserver/statereportertest.cpp1
4 files changed, 4 insertions, 2 deletions
diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp
index e06b2183380..d293df6bfc1 100644
--- a/storage/src/tests/common/metricstest.cpp
+++ b/storage/src/tests/common/metricstest.cpp
@@ -17,8 +17,8 @@
#include <tests/common/testhelper.h>
#include <tests/common/dummystoragelink.h>
#include <iostream>
-#include <string>
#include <chrono>
+#include <vespa/metrics/metricmanager.h>
LOG_SETUP(".test.metrics");
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index 67a8d06cc0d..4bea7b3646a 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -465,7 +465,7 @@ Distributor_Test::testMetricUpdateHookUpdatesPendingMaintenanceMetrics()
// Force trigger update hook
vespalib::Monitor l;
- _distributor->_metricUpdateHook.updateMetrics(metrics::MetricLockGuard(l));
+ _distributor->_metricUpdateHook.updateMetrics(vespalib::MonitorGuard(l));
// Metrics should now be updated to the last complete working state
{
const IdealStateMetricSet& metrics(getIdealStateManager().getMetrics());
diff --git a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
index cc7e98d8718..383098cefe1 100644
--- a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
+++ b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
@@ -2,6 +2,7 @@
#include <vespa/fastos/fastos.h>
#include <vespa/metrics/metrics.h>
+#include <vespa/metrics/metricmanager.h>
#include <vespa/storage/frameworkimpl/memory/memorystatusviewer.h>
#include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h>
#include <tests/common/teststorageapp.h>
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index ef1592bce80..3f3825f344d 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -7,6 +7,7 @@
#include <vespa/storage/persistence/filestorage/filestormanager.h>
#include <vespa/storage/storageserver/applicationgenerationfetcher.h>
#include <vespa/storage/storageserver/statereporter.h>
+#include <vespa/metrics/metricmanager.h>
#include <tests/common/teststorageapp.h>
#include <tests/common/testhelper.h>
#include <tests/common/dummystoragelink.h>