diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-11-20 12:18:16 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-11-20 12:18:16 +0000 |
commit | 9418fd588c9ab7a251963da258067f0a308b22c0 (patch) | |
tree | ed46234f68ded122f6046722a37919538e6459ff /persistence | |
parent | fcb20ca2177d09f23cb518a04e85eb7af3f55d49 (diff) |
Add bucketSpace argument to storage::spi::PersistenceProvider::setClusterState() method.
Diffstat (limited to 'persistence')
8 files changed, 14 insertions, 12 deletions
diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp index 30e6e2236de..c9e6b44508e 100644 --- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp +++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp @@ -4,6 +4,7 @@ #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/document/base/documentid.h> +#include <vespa/document/test/make_bucket_space.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/config-stor-distribution.h> @@ -11,6 +12,7 @@ using namespace storage::spi; using namespace storage; +using document::test::makeBucketSpace; using dummy::BucketContent; namespace { @@ -79,7 +81,7 @@ TEST_F("require that setClusterState sets the cluster state", Fixture) { document::DocumentTypeRepo::SP repo; dummy::DummyPersistence provider(repo); - provider.setClusterState(state); + provider.setClusterState(makeBucketSpace(), state); EXPECT_EQUAL(false, provider.getClusterState().nodeUp()); } diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp index 57ebd36ce00..885d3e9aad7 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp @@ -2137,7 +2137,7 @@ void ConformanceTest::testBucketActivation() Context context(defaultLoadType, Priority(0), Trace::TraceLevel(0)); Bucket bucket(makeSpiBucket(BucketId(8, 0x01))); - spi->setClusterState(createClusterState()); + spi->setClusterState(makeBucketSpace(), createClusterState()); spi->createBucket(bucket, context); CPPUNIT_ASSERT(!spi->getBucketInfo(bucket).getBucketInfo().isActive()); @@ -2156,9 +2156,9 @@ void ConformanceTest::testBucketActivation() CPPUNIT_ASSERT(spi->getBucketInfo(bucket).getBucketInfo().isActive()); // Setting node down should clear active flag. - spi->setClusterState(createClusterState(lib::State::DOWN)); + spi->setClusterState(makeBucketSpace(), createClusterState(lib::State::DOWN)); CPPUNIT_ASSERT(!spi->getBucketInfo(bucket).getBucketInfo().isActive()); - spi->setClusterState(createClusterState(lib::State::UP)); + spi->setClusterState(makeBucketSpace(), createClusterState(lib::State::UP)); CPPUNIT_ASSERT(!spi->getBucketInfo(bucket).getBucketInfo().isActive()); // Actively clearing it should of course also clear it @@ -2185,7 +2185,7 @@ void ConformanceTest::testBucketActivationSplitAndJoin() Document::SP doc1 = testDocMan.createRandomDocumentAtLocation(0x02, 1); Document::SP doc2 = testDocMan.createRandomDocumentAtLocation(0x06, 2); - spi->setClusterState(createClusterState()); + spi->setClusterState(makeBucketSpace(), createClusterState()); spi->createBucket(bucketC, context); spi->put(bucketC, Timestamp(1), doc1, context); spi->put(bucketC, Timestamp(2), doc2, context); diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp index 5c38679f52c..9a4f094d32c 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp @@ -370,7 +370,7 @@ DummyPersistence::getModifiedBuckets(BucketSpace) const } Result -DummyPersistence::setClusterState(const ClusterState& c) +DummyPersistence::setClusterState(BucketSpace, const ClusterState& c) { vespalib::MonitorGuard lock(_monitor); _clusterState.reset(new ClusterState(c)); diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index 50a4562ea3b..f89afbcac5d 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -142,7 +142,7 @@ public: */ BucketIdListResult getModifiedBuckets(BucketSpace bucketSpace) const override; - Result setClusterState(const ClusterState& newState) override; + Result setClusterState(BucketSpace bucketSpace, const ClusterState& newState) override; Result setActiveState(const Bucket& bucket, BucketInfo::ActiveState newState) override; BucketInfoResult getBucketInfo(const Bucket&) const override; Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override; diff --git a/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h b/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h index 2460259cfe7..07482873467 100644 --- a/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h +++ b/persistence/src/vespa/persistence/spi/abstractpersistenceprovider.h @@ -55,7 +55,7 @@ public: /** * Default impl empty. */ - Result setClusterState(const ClusterState&) override { return Result(); } + Result setClusterState(BucketSpace, const ClusterState&) override { return Result(); } /** * Default impl empty. diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp index e338c76fb88..76b0a3c4686 100644 --- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp +++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp @@ -113,10 +113,10 @@ Impl::listBuckets(BucketSpace bucketSpace, PartitionId v1) const } Result -Impl::setClusterState(const ClusterState& v1) +Impl::setClusterState(BucketSpace bucketSpace, const ClusterState& v1) { PRE_PROCESS(3); - Result r(_next->setClusterState(v1)); + Result r(_next->setClusterState(bucketSpace, v1)); POST_PROCESS(3, r); return r; } diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h index 8ec2e2dd1bc..e169ad098c7 100644 --- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h +++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h @@ -35,7 +35,7 @@ public: Result initialize() override; PartitionStateListResult getPartitionStates() const override; BucketIdListResult listBuckets(BucketSpace bucketSpace, PartitionId) const override; - Result setClusterState(const ClusterState&) override; + Result setClusterState(BucketSpace bucketSpace, const ClusterState&) override; Result setActiveState(const Bucket&, BucketInfo::ActiveState) override; BucketInfoResult getBucketInfo(const Bucket&) const override; Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override; diff --git a/persistence/src/vespa/persistence/spi/persistenceprovider.h b/persistence/src/vespa/persistence/spi/persistenceprovider.h index b10ed618e88..d7a5fa2b4a4 100644 --- a/persistence/src/vespa/persistence/spi/persistenceprovider.h +++ b/persistence/src/vespa/persistence/spi/persistenceprovider.h @@ -93,7 +93,7 @@ struct PersistenceProvider * supplied (changes that relate to the distributor will not cause an * update here). */ - virtual Result setClusterState(const ClusterState&) = 0; + virtual Result setClusterState(BucketSpace bucketSpace, const ClusterState&) = 0; /** * Sets the bucket state to active or inactive. After this returns, |