Merge pull request #6421 from vespa-engine/balder/compute-bloat-after-flush

Compute bloat after when it is more accurate.

1 files changed, 5 insertions, 3 deletions

diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
index 6674952d202..1f5a904a514 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
@@ -296,15 +296,17 @@ LogDataStore::compact(uint64_t syncToken)
     uint64_t usage = getDiskFootprint();
     uint64_t bloat = getDiskBloat();
     LOG(debug, "%s", bloatMsg(bloat, usage).c_str());
-    if (_fileChunks.size() > 1) {
+    const bool doCompact = (_fileChunks.size() > 1);
+    if (doCompact) {
         LOG(info, "%s. Will compact", bloatMsg(bloat, usage).c_str());
         compactWorst(_config.getMaxDiskBloatFactor(), _config.getMaxBucketSpread());
+    }
+    flushActiveAndWait(syncToken);
+    if (doCompact) {
         usage = getDiskFootprint();
         bloat = getDiskBloat();
         LOG(info, "Done compacting. %s", bloatMsg(bloat, usage).c_str());
     }
-
-    flushActiveAndWait(syncToken);
 }
 
 size_t