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/tests/proton/reprocessing | |
| 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/tests/proton/reprocessing')
| -rw-r--r-- | searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp index 6cd07849fab..c2664d4e143 100644 --- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp +++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp @@ -11,6 +11,7 @@ #include <vespa/searchcore/proton/reprocessing/i_reprocessing_handler.h> #include <vespa/searchcore/proton/test/attribute_utils.h> #include <vespa/searchlib/attribute/attributefactory.h> +#include <vespa/searchlib/attribute/interlock.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/test/directory_handler.h> #include <vespa/vespalib/gtest/gtest.h> @@ -93,7 +94,8 @@ MyConfig::MyConfig() _shared(), _hwInfo(), _mgr(new AttributeManager(TEST_DIR, "test.subdb", TuneFileAttributes(), - _fileHeaderContext, _attributeFieldWriter, _shared, _hwInfo)), + _fileHeaderContext, std::make_shared<search::attribute::Interlock>(), + _attributeFieldWriter, _shared, _hwInfo)), _schema() {} MyConfig::~MyConfig() = default; @@ -149,7 +151,8 @@ public: _attributeFieldWriter(), _shared(), _hwInfo(), - _mgr(new AttributeManager(TEST_DIR, "test.subdb", TuneFileAttributes(), _fileHeaderContext, + _mgr(new AttributeManager(TEST_DIR, "test.subdb", TuneFileAttributes(), + _fileHeaderContext, std::make_shared<search::attribute::Interlock>(), _attributeFieldWriter, _shared, _hwInfo)), _oldCfg(), _newCfg(), |