diff options
| -rw-r--r-- | configdefinitions/src/vespa/stor-filestor.def | 21 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | 3 |
2 files changed, 1 insertions, 23 deletions
diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def index c7ac1472d30..13e304823ff 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/stor-filestor.def @@ -93,24 +93,3 @@ async_operation_throttler.resize_rate double default=3.0 ## level, i.e. per ApplyBucketDiff message, regardless of how many document operations ## are contained within. async_operation_throttler.throttle_individual_merge_feed_ops bool default=true - -## Specify throttling used for async persistence operations. This throttling takes place -## before operations are dispatched to Proton and serves as a limiter for how many -## operations may be in flight in Proton's internal queues. -## -## - UNLIMITED is, as it says on the tin, unlimited. Offers no actual throttling, but -## has near zero overhead and never blocks. -## - DYNAMIC uses DynamicThrottlePolicy under the hood and will block if the window -## is full (if a blocking throttler API call is invoked). -## -## TODO deprecate in favor of the async_operation_throttler struct instead. -async_operation_throttler_type enum { UNLIMITED, DYNAMIC } default=DYNAMIC - -## Specifies the extent the throttling window is increased by when the async throttle -## policy has decided that more concurrent operations are desirable. Also affects the -## _minimum_ size of the throttling window; its size is implicitly set to max(this config -## value, number of threads). -## -## Only applies if async_operation_throttler_type == DYNAMIC. -## DEPRECATED! use the async_operation_throttler struct instead -async_operation_dynamic_throttling_window_increment int default=20 restart diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index ecf5b33200b..90703050009 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -212,8 +212,7 @@ FileStorManager::on_configure(const StorFilestorConfig& config) _use_async_message_handling_on_schedule = config.useAsyncMessageHandlingOnSchedule; _host_info_reporter.set_noise_level(config.resourceUsageReporterNoiseLevel); - const bool use_dynamic_throttling = ((config.asyncOperationThrottlerType == StorFilestorConfig::AsyncOperationThrottlerType::DYNAMIC) || - (config.asyncOperationThrottler.type == StorFilestorConfig::AsyncOperationThrottler::Type::DYNAMIC)); + const bool use_dynamic_throttling = (config.asyncOperationThrottler.type == StorFilestorConfig::AsyncOperationThrottler::Type::DYNAMIC); const bool throttle_merge_feed_ops = config.asyncOperationThrottler.throttleIndividualMergeFeedOps; if (!liveUpdate) { |