diff options
Diffstat (limited to 'storage/src/tests')
-rw-r--r-- | storage/src/tests/bucketdb/bucketmanagertest.cpp | 16 | ||||
-rw-r--r-- | storage/src/tests/storageserver/statemanagertest.cpp | 11 |
2 files changed, 18 insertions, 9 deletions
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index ea3a782d432..e9a9520e8c0 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -22,7 +22,7 @@ #include <vespa/vdslib/state/random.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> -#include <vespa/vespalib/io/fileutil.h> +#include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/gtest/gtest.h> #include <future> @@ -518,6 +518,20 @@ TEST_F(BucketManagerTest, metrics_are_tracked_per_bucket_space) { EXPECT_EQ(0, global_m->second->ready_buckets.getLast()); verify_db_memory_metrics_present(global_m->second->bucket_db_metrics); + using namespace vespalib::jsonstream; + vespalib::asciistream ascii; + vespalib::JsonStream jsonStream(ascii, false); + jsonStream << Object() << "values" << Array(); + _manager->report(jsonStream); + jsonStream << End(); + EXPECT_EQ(std::string("{\"values\":[" + "{\"name\":\"vds.datastored.bucket_space.buckets_total\",\"values\":{\"last\":1},\"dimensions\":{\"bucketSpace\":\"global\"}}," + "{\"name\":\"vds.datastored.bucket_space.buckets_total\",\"values\":{\"last\":1},\"dimensions\":{\"bucketSpace\":\"default\"}}," + "{\"name\":\"vds.datastored.alldisks.docs\",\"values\":{\"last\":250}}," + "{\"name\":\"vds.datastored.alldisks.bytes\",\"values\":{\"last\":500}}," + "{\"name\":\"vds.datastored.alldisks.buckets\",\"values\":{\"last\":2}}" + "]"), + std::string(ascii.c_str())); } void diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp index 5764460f5bb..d757a83db01 100644 --- a/storage/src/tests/storageserver/statemanagertest.cpp +++ b/storage/src/tests/storageserver/statemanagertest.cpp @@ -1,6 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/metrics/metricmanager.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/state.h> #include <vespa/vdslib/state/cluster_state_bundle.h> @@ -20,10 +19,9 @@ using namespace ::testing; namespace storage { -struct StateManagerTest : Test { +struct StateManagerTest : Test, NodeStateReporter { std::unique_ptr<TestServiceLayerApp> _node; std::unique_ptr<DummyStorageLink> _upper; - std::unique_ptr<metrics::MetricManager> _metricManager; StateManager* _manager; DummyStorageLink* _lower; @@ -42,6 +40,7 @@ struct StateManagerTest : Test { std::string get_node_info() const { return _manager->getNodeInfo(); } + void report(vespalib::JsonStream &) const override {} void extract_cluster_state_version_from_host_info(uint32_t& version_out); }; @@ -60,11 +59,8 @@ StateManagerTest::SetUp() _node = std::make_unique<TestServiceLayerApp>(NodeIndex(2)); // Clock will increase 1 sec per call. _node->getClock().setAbsoluteTimeInSeconds(1); - _metricManager = std::make_unique<metrics::MetricManager>(); _upper = std::make_unique<DummyStorageLink>(); - _manager = new StateManager(_node->getComponentRegister(), - *_metricManager, - std::make_unique<HostInfo>()); + _manager = new StateManager(_node->getComponentRegister(), std::make_unique<HostInfo>(), *this, false); _lower = new DummyStorageLink(); _upper->push_back(StorageLink::UP(_manager)); _upper->push_back(StorageLink::UP(_lower)); @@ -83,7 +79,6 @@ StateManagerTest::TearDown() { _upper->flush(); _upper.reset(); _node.reset(); - _metricManager.reset(); } void |