diff options
3 files changed, 2 insertions, 20 deletions
diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def index e9165f5adc9..b90d37314c5 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/stor-filestor.def @@ -3,22 +3,10 @@ namespace=vespa.config.content ## DETECT FAILURE PARAMETERS -## After seeing given number of errors on a disk, storage will disable the -## disk and restart. If set to 0, storage will never disable disks. Note -## that if you get disk errors, which arent automatically fixed, this will -## make storage keep failing all operations towards this disk, and all -## retries will use the same disk and same file, so you might end up with a -## lot of operations that can never succeed. Thus, it is not recommended to -## turn this off. +## Deprecated and unused - will soon go away fail_disk_after_error_count int default=1 restart -## If a disk operation takes more time in seconds than the disk operation -## timeout, storage will consider that a disk failure, and mark the disk -## bad, restart and not use the disk anymore. Note that currently, this -## includes CPU time too, so if used, this parameter should be set fairly -## high as we still sometimes have some operations that might take a few -## seconds. Disabled by default as we currently have these long operations -## during normal load. +## Deprecated and unused - will soon go away disk_operation_timeout int default=0 restart ## PERFORMANCE PARAMETERS diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index 0626f3d687e..6b70148a859 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -52,8 +52,6 @@ FileStorManager(const config::ConfigUri & configUri, spi::PersistenceProvider& p _threads(), _bucketOwnershipNotifier(std::make_unique<BucketOwnershipNotifier>(_component, *this)), _configFetcher(configUri.getContext()), - _threadLockCheckInterval(60), - _failDiskOnError(false), _use_async_message_handling_on_schedule(false), _metrics(std::make_unique<FileStorMetrics>()), _closed(false), @@ -163,8 +161,6 @@ FileStorManager::configure(std::unique_ptr<vespa::config::content::StorFilestorC // If true, this is not the first configure. bool liveUpdate = ! _threads.empty(); - _threadLockCheckInterval = config->diskOperationTimeout; - _failDiskOnError = (config->failDiskAfterErrorCount > 0); _use_async_message_handling_on_schedule = config->useAsyncMessageHandlingOnSchedule; if (!liveUpdate) { diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index af290b7b085..08135fb6c9b 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -64,8 +64,6 @@ class FileStorManager : public StorageLinkQueued, std::unique_ptr<vespa::config::content::StorFilestorConfig> _config; config::ConfigFetcher _configFetcher; - uint32_t _threadLockCheckInterval; // In seconds - bool _failDiskOnError; bool _use_async_message_handling_on_schedule; std::shared_ptr<FileStorMetrics> _metrics; std::unique_ptr<FileStorHandler> _filestorHandler; |