diff options
author | Geir Storli <geirst@oath.com> | 2018-11-23 12:01:31 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2018-11-23 12:10:46 +0000 |
commit | b45b1f751db93c347fe7359274897e248ad6b927 (patch) | |
tree | 95419b985ffbcd28b29f92118969b827f6f86517 /storage/src | |
parent | 357f56fe692f3069f93b1d50839696a5b9f8dd4e (diff) |
Remove experimental enable-multiple-bucket-spaces flag.
The feature has been default on since late May 2018.
Diffstat (limited to 'storage/src')
6 files changed, 4 insertions, 50 deletions
diff --git a/storage/src/vespa/storage/common/storagecomponent.cpp b/storage/src/vespa/storage/common/storagecomponent.cpp index 1d6b563f6eb..21a4b8eea64 100644 --- a/storage/src/vespa/storage/common/storagecomponent.cpp +++ b/storage/src/vespa/storage/common/storagecomponent.cpp @@ -62,13 +62,6 @@ StorageComponent::setDistribution(DistributionSP distribution) } void -StorageComponent::enableMultipleBucketSpaces(bool value) -{ - std::lock_guard guard(_lock); - _enableMultipleBucketSpaces = value; -} - -void StorageComponent::setNodeStateUpdater(NodeStateUpdater& updater) { std::lock_guard guard(_lock); @@ -91,8 +84,7 @@ StorageComponent::StorageComponent(StorageComponentRegister& compReg, _bucketIdFactory(), _distribution(), _nodeStateUpdater(nullptr), - _lock(), - _enableMultipleBucketSpaces(false) + _lock() { compReg.registerStorageComponent(*this); } @@ -145,11 +137,4 @@ StorageComponent::getDistribution() const return _distribution; } -bool -StorageComponent::enableMultipleBucketSpaces() const -{ - std::lock_guard guard(_lock); - return _enableMultipleBucketSpaces; -} - } // storage diff --git a/storage/src/vespa/storage/common/storagecomponent.h b/storage/src/vespa/storage/common/storagecomponent.h index 168bdbe9aa6..901594ade99 100644 --- a/storage/src/vespa/storage/common/storagecomponent.h +++ b/storage/src/vespa/storage/common/storagecomponent.h @@ -83,7 +83,6 @@ public: void setPriorityConfig(const PriorityConfig&); void setBucketIdFactory(const document::BucketIdFactory&); void setDistribution(DistributionSP); - void enableMultipleBucketSpaces(bool value); StorageComponent(StorageComponentRegister&, vespalib::stringref name); virtual ~StorageComponent(); @@ -102,7 +101,6 @@ public: uint8_t getPriority(const documentapi::LoadType&) const; DistributionSP getDistribution() const; NodeStateUpdater& getStateUpdater() const; - bool enableMultipleBucketSpaces() const; private: vespalib::string _clusterName; @@ -115,7 +113,6 @@ private: DistributionSP _distribution; NodeStateUpdater* _nodeStateUpdater; mutable std::mutex _lock; - bool _enableMultipleBucketSpaces; }; struct StorageComponentRegister : public virtual framework::ComponentRegister diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.cpp b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.cpp index 0a172ccd4e2..2f66027ccab 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.cpp +++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.cpp @@ -21,8 +21,7 @@ StorageComponentRegisterImpl::StorageComponentRegisterImpl() _bucketIdFactory(), _distribution(), _nodeStateUpdater(nullptr), - _bucketSpacesConfig(), - _enableMultipleBucketSpaces(false) + _bucketSpacesConfig() { } @@ -43,7 +42,6 @@ StorageComponentRegisterImpl::registerStorageComponent(StorageComponent& smc) smc.setPriorityConfig(_priorityConfig); smc.setBucketIdFactory(_bucketIdFactory); smc.setDistribution(_distribution); - smc.enableMultipleBucketSpaces(_enableMultipleBucketSpaces); } void @@ -133,19 +131,4 @@ StorageComponentRegisterImpl::setBucketSpacesConfig(const BucketspacesConfig& co _bucketSpacesConfig = config; } -void StorageComponentRegisterImpl::setEnableMultipleBucketSpaces(bool enabled) { - vespalib::LockGuard lock(_componentLock); - assert(!_enableMultipleBucketSpaces); // Cannot disable once enabled. - _enableMultipleBucketSpaces = enabled; - for (auto& component : _components) { - component->enableMultipleBucketSpaces(_enableMultipleBucketSpaces); - } -} - -bool StorageComponentRegisterImpl::enableMultipleBucketSpaces() const { - // We allow reading this outside _componentLock, as it should never be written - // again after startup. - return _enableMultipleBucketSpaces; -} - } // storage diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h index 1621f4e71f3..2f8bfaab87b 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h @@ -36,7 +36,6 @@ class StorageComponentRegisterImpl lib::Distribution::SP _distribution; NodeStateUpdater* _nodeStateUpdater; BucketspacesConfig _bucketSpacesConfig; - bool _enableMultipleBucketSpaces; public: typedef std::unique_ptr<StorageComponentRegisterImpl> UP; @@ -67,10 +66,6 @@ public: virtual void setBucketIdFactory(const document::BucketIdFactory&); virtual void setDistribution(lib::Distribution::SP); virtual void setBucketSpacesConfig(const BucketspacesConfig&); - - virtual void setEnableMultipleBucketSpaces(bool enabled); // To be called during startup configuration phase only. - bool enableMultipleBucketSpaces() const; - }; } // storage diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index eee688b1fb2..5a1c2aed113 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -439,8 +439,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(), - _component.enableMultipleBucketSpaces())), + .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes())), params, _configUri); @@ -781,7 +780,7 @@ void CommunicationManager::updateMessagebusProtocol( auto newDocumentProtocol = std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), repo); std::lock_guard<std::mutex> guard(_earlierGenerationsLock); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newDocumentProtocol))); - auto newStorageProtocol = std::make_shared<mbusprot::StorageProtocol>(repo, *_component.getLoadTypes(), _component.enableMultipleBucketSpaces()); + auto newStorageProtocol = std::make_shared<mbusprot::StorageProtocol>(repo, *_component.getLoadTypes()); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newStorageProtocol))); } } diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp index ed33f3846c1..d159b6e5bdd 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.cpp +++ b/storage/src/vespa/storage/storageserver/storagenode.cpp @@ -146,11 +146,6 @@ StorageNode::initialize() // and store them away, while having the config lock. subscribeToConfigs(); - // Multiple bucket spaces can only be enabled on startup and cannot be live reconfigured. - // A process restart is required to either enable or disable after the fact. - // TODO ensure config is tagged as 'restart' as a consequence - _context.getComponentRegister().setEnableMultipleBucketSpaces(_bucketSpacesConfig->enableMultipleBucketSpaces); - updateUpgradeFlag(*_clusterConfig); // First update some basics that doesn't depend on anything else to be |