diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-18 14:12:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 14:12:41 +0200 |
commit | 4b56c348956c446a9f7855b43f01d4969eea812d (patch) | |
tree | daf64ebeb9d5f48eea1b50e3c11e9f4e7110f41c /storage | |
parent | c12bbb3c36628eeaa598d3567c57c1d4a81b8ffd (diff) | |
parent | 746087ff0b65df685a40d620142cd4ed3c9ad541 (diff) |
Merge pull request #29003 from vespa-engine/vekterli/remove-unused-document-config-handler
Remove unused document config update logic
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/storagenode.cpp | 19 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/storagenode.h | 4 |
2 files changed, 0 insertions, 23 deletions
diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp index 4e07c1f6b02..64d6dd423c6 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.cpp +++ b/storage/src/vespa/storage/storageserver/storagenode.cpp @@ -93,12 +93,10 @@ StorageNode::StorageNode( _serverConfig(), _clusterConfig(), _distributionConfig(), - _doctypesConfig(), _bucketSpacesConfig(), _newServerConfig(), _newClusterConfig(), _newDistributionConfig(), - _newDoctypesConfig(), _newBucketSpacesConfig(), _component(), _node_identity(), @@ -480,23 +478,6 @@ StorageNode::configure(std::unique_ptr<StorDistributionConfig> config) { handleLiveConfigUpdate(concurrent_config_guard); } } -void -StorageNode::configure(std::unique_ptr<document::config::DocumenttypesConfig> config, - bool hasChanged, int64_t generation) -{ - log_config_received(*config); - (void) generation; - if (!hasChanged) - return; - { - std::lock_guard configLockGuard(_configLock); - _newDoctypesConfig = std::move(config); - } - if (_doctypesConfig) { - InitialGuard concurrent_config_guard(_initial_config_mutex); - handleLiveConfigUpdate(concurrent_config_guard); - } -} void StorageNode::configure(std::unique_ptr<BucketspacesConfig> config) { diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h index 70e9101a597..49dd7c96fc9 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.h +++ b/storage/src/vespa/storage/storageserver/storagenode.h @@ -130,8 +130,6 @@ private: void configure(std::unique_ptr<StorServerConfig> config) override; void configure(std::unique_ptr<UpgradingConfig> config) override; void configure(std::unique_ptr<StorDistributionConfig> config) override; - virtual void configure(std::unique_ptr<document::config::DocumenttypesConfig> config, - bool hasChanged, int64_t generation); void configure(std::unique_ptr<BucketspacesConfig>) override; void configure(std::unique_ptr<CommunicationManagerConfig> config) override; @@ -146,7 +144,6 @@ protected: std::unique_ptr<StorServerConfig> _serverConfig; std::unique_ptr<UpgradingConfig> _clusterConfig; std::unique_ptr<StorDistributionConfig> _distributionConfig; - std::unique_ptr<document::config::DocumenttypesConfig> _doctypesConfig; std::unique_ptr<BucketspacesConfig> _bucketSpacesConfig; std::unique_ptr<CommunicationManagerConfig> _comm_mgr_config; @@ -154,7 +151,6 @@ protected: std::unique_ptr<StorServerConfig> _newServerConfig; std::unique_ptr<UpgradingConfig> _newClusterConfig; std::unique_ptr<StorDistributionConfig> _newDistributionConfig; - std::unique_ptr<document::config::DocumenttypesConfig> _newDoctypesConfig; std::unique_ptr<BucketspacesConfig> _newBucketSpacesConfig; std::unique_ptr<CommunicationManagerConfig> _new_comm_mgr_config; std::unique_ptr<StorageComponent> _component; |