diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-02 11:56:26 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-02 13:11:07 +0000 |
commit | be0ba3bac9cb28e34d2f9476422c23d37a4772fd (patch) | |
tree | 705c07bccf7cc8f112a71d74edc789a31379e064 /storageserver | |
parent | 6a611fed8a1ed5824956702b9e86b3e7719140b9 (diff) |
- Always inhibit_default_merges_when_global_merges_pending
- Only show config to the code that needs it.
- Avoid using config autogenerated internals around in the code.
Diffstat (limited to 'storageserver')
-rw-r--r-- | storageserver/src/vespa/storageserver/app/distributorprocess.cpp | 9 | ||||
-rw-r--r-- | storageserver/src/vespa/storageserver/app/distributorprocess.h | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp index b56a4e1884b..f922d3d963d 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp @@ -2,6 +2,8 @@ #include "distributorprocess.h" #include <vespa/config/helper/configgetter.hpp> +#include <vespa/storage/config/config-stor-distributormanager.h> +#include <vespa/storage/config/config-stor-visitordispatcher.h> #include <vespa/storage/common/bucket_stripe_utils.h> #include <vespa/storage/common/i_storage_chain_builder.h> #include <vespa/storage/common/storagelink.h> @@ -58,11 +60,8 @@ adjusted_num_distributor_stripes(int32_t cfg_n_stripes) void DistributorProcess::setupConfig(vespalib::duration subscribeTimeout) { - using vespa::config::content::core::StorDistributormanagerConfig; - using vespa::config::content::core::StorVisitordispatcherConfig; - - _distributorConfigHandler = _configSubscriber.subscribe<StorDistributormanagerConfig>(_configUri.getConfigId(), subscribeTimeout); - _visitDispatcherConfigHandler = _configSubscriber.subscribe<StorVisitordispatcherConfig>(_configUri.getConfigId(), subscribeTimeout); + _distributorConfigHandler = _configSubscriber.subscribe<DistributorManagerConfig>(_configUri.getConfigId(), subscribeTimeout); + _visitDispatcherConfigHandler = _configSubscriber.subscribe<VisitorDispatcherConfig>(_configUri.getConfigId(), subscribeTimeout); Process::setupConfig(subscribeTimeout); } diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h index 2eeb037207e..94156ab3f53 100644 --- a/storageserver/src/vespa/storageserver/app/distributorprocess.h +++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h @@ -16,13 +16,11 @@ class IStorageChainBuilder; class DistributorProcess final : public Process { DistributorNodeContext _context; - uint32_t _num_distributor_stripes; - DistributorNode::UP _node; - config::ConfigHandle<vespa::config::content::core::StorDistributormanagerConfig>::UP - _distributorConfigHandler; - config::ConfigHandle<vespa::config::content::core::StorVisitordispatcherConfig>::UP - _visitDispatcherConfigHandler; - std::unique_ptr<IStorageChainBuilder> _storage_chain_builder; + uint32_t _num_distributor_stripes; + DistributorNode::UP _node; + config::ConfigHandle<DistributorManagerConfig>::UP _distributorConfigHandler; + config::ConfigHandle<VisitorDispatcherConfig>::UP _visitDispatcherConfigHandler; + std::unique_ptr<IStorageChainBuilder> _storage_chain_builder; public: explicit DistributorProcess(const config::ConfigUri & configUri); |