Before deciding if it is necessary to restart the scan we must wait until all pending operations are completed.

1 files changed, 7 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
index 58019d9a73a..dcc19501dd1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
@@ -17,7 +17,6 @@
 #include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/vespalib/util/gate.h>
 #include <cassert>
-#include <thread>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.lidspace.compactionjob");
@@ -221,8 +220,13 @@ CompactionJob::run()
         _is_disabled = false;
     }
 
-    LidUsageStats stats = _handler->getLidStatus();
     if (_scanItr && !_scanItr->valid()) {
+        bool numPending = getLimiter().numPending();
+        if (numPending > 0) {
+            // We must wait to decide if a rescan is necessary until all operations are completed
+            return false;
+        }
+        LidUsageStats stats = _handler->getLidStatus();
         if (shouldRestartScanDocuments(stats)) {
             _scanItr = _handler->getIterator();
         } else {
@@ -232,6 +236,7 @@ CompactionJob::run()
         }
     }
 
+    LidUsageStats stats = _handler->getLidStatus();
     if (_scanItr) {
         return scanDocuments(stats);
     } else if (_shouldCompactLidSpace) {