diff options
author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2018-05-09 09:13:44 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@oath.com> | 2018-05-31 10:56:00 +0200 |
commit | 05a6c815d28405f98c06a6bfb226ecc9f64fc69d (patch) | |
tree | d094b0357c92d711e3a3410a97c02db1880ca9cb | |
parent | 80fcc3e1159ad6b11c0650c17f446a133c10467d (diff) |
Implicitly enable multiple bucket spaces in content backend
Config can still force new protocol version to be used even if
version handshake indicates it should not be.
3 files changed, 8 insertions, 12 deletions
diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp index ad98d64b173..6bb2ca31ec1 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.cpp +++ b/storage/src/vespa/storage/storageserver/storagenode.cpp @@ -206,10 +206,8 @@ StorageNode::initialize() _chain.reset(createChain().release()); - if (_component->enableMultipleBucketSpaces()) { - assert(_communicationManager != nullptr); - _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig); - } + assert(_communicationManager != nullptr); + _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig); // Start the metric manager, such that it starts generating snapshots // and the like. Note that at this time, all metrics should hopefully @@ -359,9 +357,7 @@ StorageNode::handleLiveConfigUpdate(const InitialGuard & initGuard) if (_newBucketSpacesConfig) { _bucketSpacesConfig = std::move(_newBucketSpacesConfig); _context.getComponentRegister().setBucketSpacesConfig(*_bucketSpacesConfig); - if (_component->enableMultipleBucketSpaces()) { - _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig); - } + _communicationManager->updateBucketSpacesConfig(*_bucketSpacesConfig); } } diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp index 33fca0f161a..f83188f7dd8 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp @@ -17,12 +17,12 @@ mbus::string StorageProtocol::NAME = "StorageProtocol"; StorageProtocol::StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo> repo, const documentapi::LoadTypeSet& loadTypes, - bool activateBucketSpaceSerialization) + bool configForcedBucketSpaceSerialization) : _serializer5_0(repo, loadTypes), _serializer5_1(repo, loadTypes), _serializer5_2(repo, loadTypes), _serializer6_0(repo, loadTypes), - _activateBucketSpaceSerialization(activateBucketSpaceSerialization) + _configForcedBucketSpaceSerialization(configForcedBucketSpaceSerialization) { } @@ -106,7 +106,7 @@ StorageProtocol::encode(const vespalib::Version& version, } else if (version < version5_2) { return encodeMessage(_serializer5_1, routable, message, version5_1, version); } else { - if (_activateBucketSpaceSerialization) { + if (_configForcedBucketSpaceSerialization) { return encodeMessage(_serializer6_0, routable, message, version6_0, version); } else { if (version < version6_0) { @@ -184,7 +184,7 @@ StorageProtocol::decode(const vespalib::Version & version, } else if (version < version5_2) { return decodeMessage(_serializer5_1, data, type, version5_1, version); } else { - if (_activateBucketSpaceSerialization) { + if (_configForcedBucketSpaceSerialization) { return decodeMessage(_serializer6_0, data, type, version6_0, version); } else { if (version < version6_0) { diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h index d85e9d55d1a..56f271db1d0 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h @@ -29,7 +29,7 @@ private: ProtocolSerialization5_1 _serializer5_1; ProtocolSerialization5_2 _serializer5_2; ProtocolSerialization6_0 _serializer6_0; - bool _activateBucketSpaceSerialization; + bool _configForcedBucketSpaceSerialization; }; } |