diff options
| author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2020-07-06 10:02:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 10:02:25 +0200 |
| commit | 475bd34f0c56bb6d59ae6f5bb7c12092dc6819f4 (patch) | |
| tree | 22759d3bdc7037b6552f9d12e6a5e679b0f68995 /storageserver | |
| parent | c44eaefc2f3b541c2a435f360709fd4fc7b1de4d (diff) | |
| parent | e1937ead260a9094bbb77b44d4c6fa3aac7d2924 (diff) | |
Merge pull request #13798 from vespa-engine/vekterli/remove-legacy-distributor-bucket-database-implementation
Remove legacy distributor bucket DB implementation and config wiring
Diffstat (limited to 'storageserver')
| -rw-r--r-- | storageserver/src/vespa/storageserver/app/distributorprocess.cpp | 7 | ||||
| -rw-r--r-- | storageserver/src/vespa/storageserver/app/distributorprocess.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp index 938ca63b50f..d9972116559 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp @@ -11,8 +11,7 @@ namespace storage { DistributorProcess::DistributorProcess(const config::ConfigUri & configUri) : Process(configUri), - _activeFlag(DistributorNode::NO_NEED_FOR_ACTIVE_STATES), - _use_btree_database(false) + _activeFlag(DistributorNode::NO_NEED_FOR_ACTIVE_STATES) { } @@ -39,8 +38,6 @@ DistributorProcess::setupConfig(milliseconds subscribeTimeout) if (stor_config->persistenceProvider.type != StorServerConfig::PersistenceProvider::Type::STORAGE) { _activeFlag = DistributorNode::NEED_ACTIVE_BUCKET_STATES_SET; } - auto dist_config = config::ConfigGetter<StorDistributormanagerConfig>::getConfig(_configUri.getConfigId(), _configUri.getContext(), subscribeTimeout); - _use_btree_database = dist_config->useBtreeDatabase; _distributorConfigHandler = _configSubscriber.subscribe<StorDistributormanagerConfig>(_configUri.getConfigId(), subscribeTimeout); _visitDispatcherConfigHandler = _configSubscriber.subscribe<StorVisitordispatcherConfig>(_configUri.getConfigId(), subscribeTimeout); Process::setupConfig(subscribeTimeout); @@ -76,7 +73,7 @@ DistributorProcess::configUpdated() void DistributorProcess::createNode() { - _node.reset(new DistributorNode(_configUri, _context, *this, _activeFlag, _use_btree_database, StorageLink::UP())); + _node.reset(new DistributorNode(_configUri, _context, *this, _activeFlag, StorageLink::UP())); _node->handleConfigChange(*_distributorConfigHandler->getConfig()); _node->handleConfigChange(*_visitDispatcherConfigHandler->getConfig()); } diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h index e416f285268..4a2289e6151 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.h +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h @@ -15,7 +15,6 @@ namespace storage { class DistributorProcess final : public Process { DistributorNodeContext _context; DistributorNode::NeedActiveState _activeFlag; - bool _use_btree_database; DistributorNode::UP _node; config::ConfigHandle<vespa::config::content::core::StorDistributormanagerConfig>::UP _distributorConfigHandler; |