diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2018-01-18 11:27:48 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@yahoo-inc.com> | 2018-02-01 13:30:38 +0000 |
| commit | 39a95f693cf118bdb63fa38ec036863ff8f5c681 (patch) | |
| tree | d0c5fca3282eb8cbd2a8e2da522f72b8d22e337a /storage | |
| parent | 2fbbefd54be3b72730a27c394b134b439d33c212 (diff) | |
Selectively enable multiple bucket spaces in C++ document protocol
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/storageserver/communicationmanager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index 76c724fd6f8..ec39ffe7b36 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -426,8 +426,10 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> // config here. _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(), _component.enableMultipleBucketSpaces())), + .add(std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), _component.getTypeRepo(), "", + _component.enableMultipleBucketSpaces())) + .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes(), + _component.enableMultipleBucketSpaces())), params, _configUri); @@ -768,7 +770,8 @@ void CommunicationManager::updateMessagebusProtocol( const document::DocumentTypeRepo::SP &repo) { if (_mbus.get()) { framework::SecondTime now(_component.getClock().getTimeInSeconds()); - mbus::IProtocol::SP newDocumentProtocol(new documentapi::DocumentProtocol( *_component.getLoadTypes(), repo)); + mbus::IProtocol::SP newDocumentProtocol(new documentapi::DocumentProtocol( + *_component.getLoadTypes(), repo, "", _component.enableMultipleBucketSpaces())); 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(), _component.enableMultipleBucketSpaces())); |