Commit document meta store as part of feed view force commit

2 files changed, 4 insertions, 1 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index d190d39ff80..5c3fe94a8d7 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -251,8 +251,8 @@ public:
         PutRes putRes(dms.put(docId.getGlobalId(), BucketFactory::getBucketId(docId),
                               Timestamp(0u), docSize, lid, 0u));
         LOG_ASSERT(putRes.ok());
-        dms.commit(CommitParam(0u));
         uint64_t serialNum = _ddb->getFeedHandler().inc_serial_num();
+        dms.commit(CommitParam(serialNum));
         _aw->put(serialNum, doc, lid, std::shared_ptr<IDestructorCallback>());
         {
             vespalib::Gate gate;
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index c9a0892d3c3..01b6212308e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -175,6 +175,9 @@ StoreOnlyFeedView::Context::~Context() = default;
 void
 StoreOnlyFeedView::forceCommit(const CommitParam & param, DoneCallback onDone)
 {
+    if (useDocumentMetaStore(param.lastSerialNum())) {
+        _metaStore.commit(param);
+    }
     internalForceCommit(param, std::make_shared<ForceCommitContext>(_writeService.master(), _metaStore,
                                                                     _pendingLidsForCommit->produceSnapshot(),
                                                                     _gidToLidChangeHandler.grab_pending_changes(),