diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-02-23 09:09:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-23 09:09:29 +0100 |
commit | cec6b4cd41087e3173b50523ad83f5d5080e8fa1 (patch) | |
tree | aa18aa2ac2d5e2ef0aa7301ad62453a8b055a66e /searchcore/src/tests/proton/documentdb/document_subdbs | |
parent | 9edb5e75186d7d93a564c1edb1d4549c0e259a39 (diff) |
Revert "Revert "Revert "Use common tranport for TlsClient"""
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/document_subdbs')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 27636324835..6e20d30fb36 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -18,6 +18,7 @@ #include <vespa/searchcore/proton/server/fast_access_document_retriever.h> #include <vespa/searchcore/proton/server/i_document_subdb_owner.h> #include <vespa/searchcore/proton/server/igetserialnum.h> +#include <vespa/searchcore/proton/server/executorthreadingservice.h> #include <vespa/searchcore/proton/server/minimal_document_retriever.h> #include <vespa/searchcore/proton/server/searchabledocsubdb.h> #include <vespa/searchcore/proton/server/document_subdb_initializer.h> @@ -287,8 +288,9 @@ struct MyConfigSnapshot template <typename Traits> struct FixtureBase { - TransportAndExecutorService _service; - + TransportMgr _transport; + ThreadStackExecutor _summaryExecutor; + ExecutorThreadingService _writeService; typename Traits::Config _cfg; std::shared_ptr<bucketdb::BucketDBOwner> _bucketDB; BucketDBHandler _bucketDBHandler; @@ -299,13 +301,15 @@ struct FixtureBase typename Traits::SubDB _subDb; IFeedView::SP _tmpFeedView; FixtureBase() - : _service(1), + : _transport(), + _summaryExecutor(1, 64_Ki), + _writeService(_summaryExecutor), _cfg(), _bucketDB(std::make_shared<bucketdb::BucketDBOwner>()), _bucketDBHandler(*_bucketDB), - _ctx(_service.write(), _bucketDB, _bucketDBHandler), + _ctx(_writeService, _bucketDB, _bucketDBHandler), _baseSchema(), - _snapshot(std::make_unique<MyConfigSnapshot>(_service.transport(), _baseSchema, Traits::ConfigDir::dir())), + _snapshot(std::make_unique<MyConfigSnapshot>(_transport.transport(), _baseSchema, Traits::ConfigDir::dir())), _baseDir(BASE_DIR + "/" + SUB_NAME, BASE_DIR), _subDb(_cfg._cfg, _ctx._ctx), _tmpFeedView() @@ -313,8 +317,8 @@ struct FixtureBase init(); } ~FixtureBase() { - _service.write().master().execute(makeLambdaTask([this]() { _subDb.close(); })); - _service.shutdown(); + _writeService.master().execute(makeLambdaTask([this]() { _subDb.close(); })); + _writeService.shutdown(); } void setBucketStateCalculator(const std::shared_ptr<IBucketStateCalculator> & calc) { vespalib::Gate gate; @@ -323,11 +327,11 @@ struct FixtureBase } template <typename FunctionType> void runInMasterAndSync(FunctionType func) { - proton::test::runInMasterAndSync(_service.write(), func); + proton::test::runInMasterAndSync(_writeService, func); } template <typename FunctionType> void runInMaster(FunctionType func) { - proton::test::runInMaster(_service.write(), func); + proton::test::runInMaster(_writeService, func); } void init() { DocumentSubDbInitializer::SP task = @@ -345,7 +349,7 @@ struct FixtureBase runInMasterAndSync([&]() { performReconfig(serialNum, reconfigSchema, reconfigConfigDir); }); } void performReconfig(SerialNum serialNum, const Schema &reconfigSchema, const vespalib::string &reconfigConfigDir) { - auto newCfg = std::make_unique<MyConfigSnapshot>(_service.transport(), reconfigSchema, reconfigConfigDir); + auto newCfg = std::make_unique<MyConfigSnapshot>(_transport.transport(), reconfigSchema, reconfigConfigDir); DocumentDBConfig::ComparisonResult cmpResult; cmpResult.attributesChanged = true; cmpResult.documenttypesChanged = true; |