diff options
| -rw-r--r-- | storage/src/vespa/storage/storageserver/communicationmanager.cpp | 4 | ||||
| -rw-r--r-- | storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index a2c923b93db..13d4dfa5e1b 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -424,7 +424,7 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> _mbus = std::make_unique<mbus::RPCMessageBus>( mbus::ProtocolSet() .add(std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), _component.getTypeRepo())) - .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes())), + .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes(), _component.enableMultipleBucketSpaces())), params, _configUri); @@ -768,7 +768,7 @@ void CommunicationManager::updateMessagebusProtocol( mbus::IProtocol::SP newDocumentProtocol(new documentapi::DocumentProtocol( *_component.getLoadTypes(), repo)); std::lock_guard<std::mutex> guard(_earlierGenerationsLock); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newDocumentProtocol))); - mbus::IProtocol::SP newStorageProtocol(new mbusprot::StorageProtocol(repo, *_component.getLoadTypes())); + mbus::IProtocol::SP newStorageProtocol(new mbusprot::StorageProtocol(repo, *_component.getLoadTypes(), _component.enableMultipleBucketSpaces())); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newStorageProtocol))); } } diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp index edc8ca6a3b6..6d1dc8d587b 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp @@ -98,8 +98,8 @@ StorageProtocol::encode(const vespalib::Version& version, } else if (version < version5_2) { return encodeMessage(_serializer5_1, routable, message, version5_1, version); } else { - if (!_activateBucketSpaceSerialization) { - return encodeMessage(_serializer5_2, routable, message, version5_2, version); + if (_activateBucketSpaceSerialization) { + return encodeMessage(_serializer6_0, routable, message, version6_0, version); } else { if (version < version6_0) { return encodeMessage(_serializer5_2, routable, message, version5_2, version); @@ -169,8 +169,8 @@ StorageProtocol::decode(const vespalib::Version & version, } else if (version < version5_2) { return decodeMessage(_serializer5_1, data, type, version5_1, version); } else { - if (!_activateBucketSpaceSerialization) { - return decodeMessage(_serializer5_2, data, type, version5_2, version); + if (_activateBucketSpaceSerialization) { + return decodeMessage(_serializer6_0, data, type, version6_0, version); } else { if (version < version6_0) { return decodeMessage(_serializer5_2, data, type, version5_2, version); |