diff options
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/servicelayernode.cpp | 19 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/servicelayernode.h | 8 |
2 files changed, 1 insertions, 26 deletions
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.cpp b/storage/src/vespa/storage/storageserver/servicelayernode.cpp index 9faf380d2ba..ad1f38e2b40 100644 --- a/storage/src/vespa/storage/storageserver/servicelayernode.cpp +++ b/storage/src/vespa/storage/storageserver/servicelayernode.cpp @@ -91,10 +91,8 @@ ServiceLayerNode::subscribeToConfigs() { StorageNode::subscribeToConfigs(); _configFetcher.reset(new config::ConfigFetcher(_configUri.getContext())); - _configFetcher->subscribe<StorDevicesConfig>(_configUri.getConfigId(), this); vespalib::LockGuard configLockGuard(_configLock); - _deviceConfig = std::move(_newDevicesConfig); // Verify and set disk count if (_serverConfig->diskCount != 0 && _serverConfig->diskCount != _partitions.size()) @@ -207,23 +205,6 @@ ServiceLayerNode::handleLiveConfigUpdate(const InitialGuard & initGuard) StorageNode::handleLiveConfigUpdate(initGuard); } -void -ServiceLayerNode::configure(std::unique_ptr<StorDevicesConfig> config) -{ - // When we get config, we try to grab the config lock to ensure noone - // else is doing configuration work, and then we write the new config - // to a variable where we can find it later when processing config - // updates - { - vespalib::LockGuard configLockGuard(_configLock); - _newDevicesConfig = std::move(config); - } - if (_distributionConfig) { - InitialGuard concurrent_config_guard(_initial_config_mutex); - handleLiveConfigUpdate(concurrent_config_guard); - } -} - VisitorMessageSession::UP ServiceLayerNode::createSession(Visitor& visitor, VisitorThread& thread) { diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.h b/storage/src/vespa/storage/storageserver/servicelayernode.h index 12446152b90..7c0d6cd8ee3 100644 --- a/storage/src/vespa/storage/storageserver/servicelayernode.h +++ b/storage/src/vespa/storage/storageserver/servicelayernode.h @@ -15,7 +15,6 @@ #include <vespa/storage/common/visitorfactory.h> #include <vespa/storage/bucketdb/minimumusedbitstracker.h> #include <vespa/persistence/spi/persistenceprovider.h> -#include <vespa/config-stor-devices.h> #include <vespa/config/config.h> namespace storage { @@ -24,11 +23,9 @@ class FileStorManager; class ServiceLayerNode : public StorageNode, - private VisitorMessageSessionFactory, - private config::IFetcherCallback<vespa::config::storage::StorDevicesConfig> + private VisitorMessageSessionFactory { - using StorDevicesConfig = vespa::config::storage::StorDevicesConfig; ServiceLayerNodeContext& _context; spi::PersistenceProvider& _persistenceProvider; spi::PartitionStateList _partitions; @@ -37,8 +34,6 @@ class ServiceLayerNode // FIXME: Should probably use the fetcher in StorageNode std::unique_ptr<config::ConfigFetcher> _configFetcher; - std::unique_ptr<StorDevicesConfig> _deviceConfig; - std::unique_ptr<StorDevicesConfig> _newDevicesConfig; FileStorManager* _fileStorManager; bool _init_has_been_called; bool _noUsablePartitionMode; @@ -65,7 +60,6 @@ private: void subscribeToConfigs() override; void initializeNodeSpecific() override; void handleLiveConfigUpdate(const InitialGuard & initGuard) override; - void configure(std::unique_ptr<StorDevicesConfig> config) override; VisitorMessageSession::UP createSession(Visitor&, VisitorThread&) override; documentapi::Priority::Value toDocumentPriority(uint8_t storagePriority) const override; std::unique_ptr<StorageLink> createChain() override; |