Merge pull request #7682 from vespa-engine/geirst/update-attribute-status-before-exclusive-read-access

Ensure attribute status is updated before giving exclusive read access.

1 files changed, 3 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
index d1d5b1c9af7..7a31580fb16 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
@@ -37,8 +37,9 @@ ExclusiveAttributeReadAccessor(const AttributeVector::SP &attribute,
 namespace {
 
 void
-attributeWriteBlockingTask(GateSP entranceGate, GateSP exitGate)
+attributeWriteBlockingTask(AttributeVector::SP attribute, GateSP entranceGate, GateSP exitGate)
 {
+    attribute->commit(true);
     entranceGate->countDown();
     exitGate->await();
 }
@@ -51,7 +52,7 @@ ExclusiveAttributeReadAccessor::takeGuard()
     GateSP entranceGate = std::make_shared<Gate>();
     GateSP exitGate = std::make_shared<Gate>();
     _attributeFieldWriter.execute(_attributeFieldWriter.getExecutorId(_attribute->getNamePrefix()),
-                                  [entranceGate, exitGate]() { attributeWriteBlockingTask(entranceGate, exitGate); });
+                                  [this, entranceGate, exitGate]() { attributeWriteBlockingTask(_attribute, entranceGate, exitGate); });
     entranceGate->await();
     return std::make_unique<Guard>(*_attribute, exitGate);
 }