diff options
| author | Geir Storli <geirst@yahooinc.com> | 2022-03-17 14:14:58 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@yahooinc.com> | 2022-03-17 14:14:58 +0000 |
| commit | defcc21484db806f8ccf47a6864006fc54cfe193 (patch) | |
| tree | 6a2d07e2b5669b722a25bf677c21c47685f28b3a /searchcore/src/apps/tests | |
| parent | 791812f39d990fb75c11cccb72334b21bf220630 (diff) | |
Make the attribute enum change interlock shared between all document dbs.
This is to avoid a potential deadlock when using imported attributes in parent/child.
Diffstat (limited to 'searchcore/src/apps/tests')
| -rw-r--r-- | searchcore/src/apps/tests/persistenceconformance_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index 9a7b49065d4..7c0a9b29a7b 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -10,6 +10,7 @@ #include <vespa/config-rank-profiles.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> +#include <vespa/config/subscription/sourcespec.h> #include <vespa/document/base/testdocman.h> #include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/repo/documenttyperepo.h> @@ -33,12 +34,12 @@ #include <vespa/searchcore/proton/server/threading_service_config.h> #include <vespa/searchcore/proton/test/disk_mem_usage_notifier.h> #include <vespa/searchcore/proton/test/mock_shared_threading_service.h> +#include <vespa/searchlib/attribute/interlock.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/size_literals.h> -#include <vespa/config/subscription/sourcespec.h> #include <vespa/log/log.h> LOG_SETUP("persistenceconformance_test"); @@ -209,7 +210,8 @@ public: return DocumentDB::create(_baseDir, mgr.getConfig(), _tlsSpec, _queryLimiter, docType, bucketSpace, *b->getProtonConfigSP(), const_cast<DocumentDBFactory &>(*this), _shared_service, _tls, _metricsWireService, - _fileHeaderContext, _config_stores.getConfigStore(docType.toString()), + _fileHeaderContext, std::make_shared<search::attribute::Interlock>(), + _config_stores.getConfigStore(docType.toString()), std::make_shared<vespalib::ThreadStackExecutor>(16, 128_Ki), HwInfo()); } }; |