diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-23 22:00:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 22:00:01 +0100 |
commit | fa4ba96f1ebb4d2e544ff0a8e5d9cc6c3a693f78 (patch) | |
tree | 2b3a1e84d51a35b529982ffec9699d663fb8b298 /searchcore/src/tests/proton/documentdb/lid_space_compaction | |
parent | 0d43351fa8c26eb7d319c0da6a7867d431f0c50e (diff) |
Revert "Revert "Wire in the BucketExecutor.""
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/lid_space_compaction')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp | 10 | ||||
-rw-r--r-- | searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp index 926530c228e..af8086941fd 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp @@ -46,23 +46,27 @@ JobTestBase::init(uint32_t allowedLidBloat, { _handler = std::make_unique<MyHandler>(maxOutstandingMoveOps != MAX_OUTSTANDING_MOVE_OPS, useBucketDB()); DocumentDBLidSpaceCompactionConfig compactCfg(interval, allowedLidBloat, allowedLidBloatFactor, - REMOVE_BATCH_BLOCK_RATE, REMOVE_BLOCK_RATE, false); + REMOVE_BATCH_BLOCK_RATE, REMOVE_BLOCK_RATE, false, useBucketDB()); BlockableMaintenanceJobConfig blockableCfg(resourceLimitFactor, maxOutstandingMoveOps); if (useBucketDB()) { + _singleExecutor = std::make_unique<vespalib::ThreadStackExecutor>(1, 0x10000); + _master = std::make_unique<proton::ExecutorThreadService> (*_singleExecutor); _bucketExecutor = std::make_unique<storage::spi::dummy::DummyBucketExecutor>(4); - _job = std::make_unique<lidspace::CompactionJob>(compactCfg, *_handler, _storer, *_bucketExecutor, _diskMemUsageNotifier, - blockableCfg, _clusterStateHandler, nodeRetired, + _job = std::make_unique<lidspace::CompactionJob>(compactCfg, *_handler, _storer, *_master, *_bucketExecutor, + _diskMemUsageNotifier, blockableCfg, _clusterStateHandler, nodeRetired, document::BucketSpace::placeHolder()); } else { _job = std::make_unique<LidSpaceCompactionJob>(compactCfg, *_handler, _storer, _frozenHandler, _diskMemUsageNotifier, blockableCfg, _clusterStateHandler, nodeRetired); } } + void JobTestBase::sync() const { if (_bucketExecutor) { _bucketExecutor->sync(); + _master->sync(); } } diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h index 637314e2879..c81f8c8d387 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.h @@ -7,6 +7,8 @@ struct JobTestBase : public ::testing::TestWithParam<bool> { std::unique_ptr<storage::spi::BucketExecutor> _bucketExecutor; + std::unique_ptr<vespalib::SyncableThreadExecutor> _singleExecutor; + std::unique_ptr<searchcorespi::index::IThreadService> _master; std::unique_ptr<MyHandler> _handler; MyStorer _storer; MyFrozenBucketHandler _frozenHandler; |