diff options
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/servicelayernode.cpp | 17 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/storagenode.cpp | 8 |
2 files changed, 2 insertions, 23 deletions
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.cpp b/storage/src/vespa/storage/storageserver/servicelayernode.cpp index ce487a38840..68b53738b20 100644 --- a/storage/src/vespa/storage/storageserver/servicelayernode.cpp +++ b/storage/src/vespa/storage/storageserver/servicelayernode.cpp @@ -77,17 +77,6 @@ ServiceLayerNode::subscribeToConfigs() { StorageNode::subscribeToConfigs(); _configFetcher.reset(new config::ConfigFetcher(_configUri.getContext())); - - std::lock_guard configLockGuard(_configLock); - // Verify and set disk count - if (_serverConfig->diskCount != 0 - && _serverConfig->diskCount != 1u) - { - std::ostringstream ost; - ost << "Storage is configured to have " << _serverConfig->diskCount - << " disks but persistence provider states it has 1 disk."; - throw vespalib::IllegalStateException(ost.str(), VESPA_STRLOC); - } } void @@ -101,8 +90,7 @@ void ServiceLayerNode::initializeNodeSpecific() { // Give node state to mount point initialization, such that we can - // get disk count and state of unavailable disks set in reported - // node state. + // get capacity and reliability set in reported node state. NodeStateUpdater::Lock::SP lock(_component->getStateUpdater().grabStateChangeLock()); lib::NodeState ns(*_component->getStateUpdater().getReportedNodeState()); @@ -115,8 +103,6 @@ ServiceLayerNode::initializeNodeSpecific() #define DIFFER(a) (!(oldC.a == newC.a)) #define ASSIGN(a) { oldC.a = newC.a; updated = true; } -#define DIFFERWARN(a, b) \ - if (DIFFER(a)) { LOG(warning, "Live config failure: %s.", b); } void ServiceLayerNode::handleLiveConfigUpdate(const InitialGuard & initGuard) @@ -125,7 +111,6 @@ ServiceLayerNode::handleLiveConfigUpdate(const InitialGuard & initGuard) bool updated = false; vespa::config::content::core::StorServerConfigBuilder oldC(*_serverConfig); StorServerConfig& newC(*_newServerConfig); - DIFFERWARN(diskCount, "Cannot alter partition count of node live"); { updated = false; NodeStateUpdater::Lock::SP lock(_component->getStateUpdater().grabStateChangeLock()); diff --git a/storage/src/vespa/storage/storageserver/storagenode.cpp b/storage/src/vespa/storage/storageserver/storagenode.cpp index afe21733a10..c6d50e6dca6 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.cpp +++ b/storage/src/vespa/storage/storageserver/storagenode.cpp @@ -161,7 +161,7 @@ StorageNode::initialize() _component->registerMetricUpdateHook(*this, framework::SecondTime(300)); // Initializing state manager early, as others use it init time to - // update node state according to disk count and min used bits etc. + // update node state according min used bits etc. // Needs node type to be set right away. Needs thread pool, index and // dead lock detector too, but not before open() _stateManager.reset(new StateManager( @@ -319,12 +319,6 @@ StorageNode::handleLiveConfigUpdate(const InitialGuard & initGuard) LOG(info, "Live config update: Group structure altered."); ASSIGN(group); } - if (DIFFER(diskDistribution)) { - LOG(info, "Live config update: Disk distribution altered from %s to %s.", - StorDistributionConfig::getDiskDistributionName(oldC.diskDistribution).c_str(), - StorDistributionConfig::getDiskDistributionName(newC.diskDistribution).c_str()); - ASSIGN(diskDistribution); - } _distributionConfig = std::make_unique<StorDistributionConfig>(oldC); _newDistributionConfig.reset(); if (updated) { |