Avoid sync_all in AttributeWriter destructor.

2 files changed, 8 insertions, 3 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index ba7bf2cfb37..37aa83f5f7c 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -674,7 +674,12 @@ void AttributeWriter::setupAttributeMapping() {
 
 AttributeWriter::~AttributeWriter()
 {
-    _attributeFieldWriter.sync_all();
+    vespalib::Gate gate;
+    auto onDone = std::make_shared<vespalib::GateCallback>(gate);
+    for (const auto &wc : _writeContexts) {
+        _attributeFieldWriter.executeLambda(wc.getExecutorId(), [onDone] () { (void) onDone; });
+    }
+   gate.await();
 }
 
 std::vector<search::AttributeVector *>
diff --git a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
index 55d0cd479e3..d95dfd1314e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h
@@ -13,8 +13,8 @@ namespace proton {
 struct AttributeWriterFactory : public IAttributeWriterFactory
 {
     AttributeWriterFactory() {}
-    virtual IAttributeWriter::SP create(const IAttributeWriter::SP &old,
-                                        const AttributeCollectionSpec &attrSpec) const override
+    IAttributeWriter::SP create(const IAttributeWriter::SP &old,
+                                const AttributeCollectionSpec &attrSpec) const override
     {
         const AttributeWriter &oldAdapter = dynamic_cast<const AttributeWriter &>(*old.get());
         const proton::IAttributeManager::SP &oldMgr = oldAdapter.getAttributeManager();