diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-02-22 12:48:47 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-02-22 12:48:47 +0000 |
commit | 6cc9ca39379fbd9baf3cb01ef1f2b2cd85a51ed9 (patch) | |
tree | e60ef6799946586e1fbe0abe4b3f5d3e59caa00f /storage/src/tests/storageserver | |
parent | 1e7d98b23ae6b97734e1248c6028075f9b3f5d2e (diff) |
Add cluster state bundle which contains a baseline cluster state and
(later) a derived cluster state for each bucket space.
Diffstat (limited to 'storage/src/tests/storageserver')
-rw-r--r-- | storage/src/tests/storageserver/statemanagertest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp index c07c150a520..0676d3684ff 100644 --- a/storage/src/tests/storageserver/statemanagertest.cpp +++ b/storage/src/tests/storageserver/statemanagertest.cpp @@ -4,6 +4,7 @@ #include <vespa/metrics/metricmanager.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/state.h> +#include <vespa/storage/common/cluster_state_bundle.h> #include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h> #include <vespa/storage/storageserver/statemanager.h> #include <tests/common/teststorageapp.h> @@ -105,7 +106,7 @@ StateManagerTest::testSystemState() { std::shared_ptr<api::StorageReply> reply; // Verify initial state on startup - ClusterState::CSP currentState = _manager->getSystemState(); + ClusterState::CSP currentState = _manager->getClusterStateBundle()->getBaselineClusterState(); CPPUNIT_ASSERT_EQUAL(std::string("cluster:d"), currentState->toString(false)); @@ -118,7 +119,7 @@ StateManagerTest::testSystemState() _upper->sendDown(cmd); GET_ONLY_OK_REPLY(reply); - currentState = _manager->getSystemState(); + currentState = _manager->getClusterStateBundle()->getBaselineClusterState(); CPPUNIT_ASSERT_EQUAL(sendState, *currentState); currentNodeState = _manager->getCurrentNodeState(); @@ -225,7 +226,7 @@ StateManagerTest::testReportedNodeState() void StateManagerTest::testClusterStateVersion() { - ClusterState state(*_manager->getSystemState()); + ClusterState state(*_manager->getClusterStateBundle()->getBaselineClusterState()); state.setVersion(123); _manager->setClusterState(state); |