diff options
Diffstat (limited to 'searchcore/src/apps')
| -rw-r--r-- | searchcore/src/apps/tests/persistenceconformance_test.cpp | 10 | ||||
| -rw-r--r-- | searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index 417e47f6bda..da194d1ff7b 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -25,6 +25,7 @@ #include <vespa/searchcore/proton/server/memoryconfigstore.h> #include <vespa/searchcore/proton/server/persistencehandlerproxy.h> #include <vespa/searchcore/proton/server/threading_service_config.h> +#include <vespa/searchcore/proton/test/disk_mem_usage_notifier.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/searchsummary/config/config-juniperrc.h> @@ -295,10 +296,11 @@ class MyPersistenceEngine : public DocDBRepoHolder, public: MyPersistenceEngine(MyPersistenceEngineOwner &owner, MyResourceWriteFilter &writeFilter, + IDiskMemUsageNotifier& disk_mem_usage_notifier, DocumentDBRepo::UP docDbRepo, const vespalib::string &docType = "") : DocDBRepoHolder(std::move(docDbRepo)), - PersistenceEngine(owner, writeFilter, -1, false) + PersistenceEngine(owner, writeFilter, disk_mem_usage_notifier, -1, false) { addHandlers(docType); } @@ -348,6 +350,7 @@ private: vespalib::string _docType; MyPersistenceEngineOwner _engineOwner; MyResourceWriteFilter _writeFilter; + test::DiskMemUsageNotifier _disk_mem_usage_notifier; public: MyPersistenceFactory(const vespalib::string &baseDir, int tlsListenPort, SchemaConfigFactory::SP schemaFactory, @@ -358,7 +361,8 @@ public: _docDbRepo(), _docType(docType), _engineOwner(), - _writeFilter() + _writeFilter(), + _disk_mem_usage_notifier(DiskMemUsageState({ 0.8, 0.5 }, { 0.8, 0.4 })) { clear(); } @@ -369,7 +373,7 @@ public: const DocumenttypesConfig &typesCfg) override { ConfigFactory cfgFactory(repo, std::make_shared<DocumenttypesConfig>(typesCfg), _schemaFactory); _docDbRepo = std::make_unique<DocumentDBRepo>(cfgFactory, _docDbFactory); - auto engine = std::make_unique<MyPersistenceEngine>(_engineOwner,_writeFilter,std::move(_docDbRepo), _docType); + auto engine = std::make_unique<MyPersistenceEngine>(_engineOwner,_writeFilter, _disk_mem_usage_notifier, std::move(_docDbRepo), _docType); assert( ! _docDbRepo); // Repo should be handed over return engine; } diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp index 170885d1d99..a8c5912aadd 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -51,6 +51,7 @@ #include <vespa/searchcore/proton/server/memoryconfigstore.h> #include <vespa/searchcore/proton/server/persistencehandlerproxy.h> #include <vespa/searchcore/proton/server/threading_service_config.h> +#include <vespa/searchcore/proton/test/disk_mem_usage_notifier.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/searchsummary/config/config-juniperrc.h> @@ -655,6 +656,7 @@ struct PersistenceProviderFixture { std::shared_ptr<DocumentDB> _document_db; MyPersistenceEngineOwner _persistence_owner; MyResourceWriteFilter _write_filter; + test::DiskMemUsageNotifier _disk_mem_usage_notifier; std::shared_ptr<PersistenceEngine> _persistence_engine; std::unique_ptr<const FieldSetRepo> _field_set_repo; uint32_t _bucket_bits; @@ -724,6 +726,7 @@ PersistenceProviderFixture::PersistenceProviderFixture(const BMParams& params) _document_db(), _persistence_owner(), _write_filter(), + _disk_mem_usage_notifier(), _persistence_engine(), _field_set_repo(std::make_unique<const FieldSetRepo>(*_repo)), _bucket_bits(16), @@ -743,7 +746,7 @@ PersistenceProviderFixture::PersistenceProviderFixture(const BMParams& params) _message_bus() { create_document_db(params); - _persistence_engine = std::make_unique<PersistenceEngine>(_persistence_owner, _write_filter, -1, false); + _persistence_engine = std::make_unique<PersistenceEngine>(_persistence_owner, _write_filter, _disk_mem_usage_notifier, -1, false); auto proxy = std::make_shared<PersistenceHandlerProxy>(_document_db); _persistence_engine->putHandler(_persistence_engine->getWLock(), _bucket_space, _doc_type_name, proxy); _service_layer_config.add_builders(_config_set); |