summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-01-10 13:28:31 +0000
committerTor Egge <Tor.Egge@oath.com>2018-01-10 13:28:31 +0000
commit9bfd93e061a672de953d24d45483591ab058d0da (patch)
tree2e9d4bc9bff4d82f6616826790e9c2d3ce510156 /storage
parent0c63284f9b2dbd94f25c975aeb6eadd36ea93d81 (diff)
Pass enable multiple bucket spaces flag to storage protocol.
Use new serialization when multiple bucket spaces are enabled.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/storageserver/communicationmanager.cpp4
1 files changed, 2 insertions, 2 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)));
}
}