Merge pull request #16427 from vespa-engine/balder/2-stage-compact

To ensure that lid stats is sampled after everything has been complet…

2 files changed, 2 insertions, 0 deletions

diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
index 84579eb9c9e..21bd96552b8 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_jobtest.cpp
@@ -111,6 +111,7 @@ JobTestBase::endScan() {
 
 JobTestBase &
 JobTestBase::compact() {
+    EXPECT_FALSE(run());
     EXPECT_TRUE(run());
     return *this;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job_base.cpp b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job_base.cpp
index 3987282ef34..bf93ceca6d8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job_base.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job_base.cpp
@@ -138,6 +138,7 @@ LidSpaceCompactionJobBase::run()
         } else {
             _scanItr = IDocumentScanIterator::UP();
             _shouldCompactLidSpace = true;
+            return false;
         }
     }