diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-18 22:01:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 22:01:06 +0100 |
| commit | ba063a6ca30deee66590efe4ae6e4e9f6ac83b5c (patch) | |
| tree | f8ffa9a2c5cb83fcda57a14d61dbf7829372c21a /storage | |
| parent | 04e894ae96dc13b44762f600dc6a4b3f97df13c7 (diff) | |
| parent | aeb3ab8725ee058c65036d582155edc20eff654b (diff) | |
Merge pull request #20857 from vespa-engine/balder/wire-in-control-of-unbound-q
Wire in control of whether taskLimit is hard.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/persistence/persistencetestutils.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp index c163f6de024..c35be2789da 100644 --- a/storage/src/tests/persistence/persistencetestutils.cpp +++ b/storage/src/tests/persistence/persistencetestutils.cpp @@ -127,7 +127,7 @@ VESPA_THREAD_STACK_TAG(test_executor) void PersistenceTestUtils::setupExecutor(uint32_t numThreads) { - _sequenceTaskExecutor = vespalib::SequencedTaskExecutor::create(test_executor, numThreads, 1000, vespalib::Executor::OptimizeFor::ADAPTIVE); + _sequenceTaskExecutor = vespalib::SequencedTaskExecutor::create(test_executor, numThreads, 1000, true, vespalib::Executor::OptimizeFor::ADAPTIVE); } StorBucketDatabase::WrappedEntry diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index 4a215c7a348..530d96dfe3f 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -218,7 +218,7 @@ FileStorManager::configure(std::unique_ptr<StorFilestorConfig> config) _compReg, std::move(operation_throttler)); uint32_t numResponseThreads = computeNumResponseThreads(_config->numResponseThreads); _sequencedExecutor = vespalib::SequencedTaskExecutor::create(response_executor, numResponseThreads, 10000, - selectSequencer(_config->responseSequencerType)); + true, selectSequencer(_config->responseSequencerType)); assert(_sequencedExecutor); LOG(spam, "Setting up the disk"); for (uint32_t i = 0; i < numThreads; i++) { |