Warn more agressively on eviciton scans

Author: SirTyson

src/bucket/BucketList.cpp

@@ -891,6 +891,22 @@ BucketList::scanForEviction(Application& app, AbstractLedgerTxn& ltx,
         auto initialLevel = evictionIter.bucketListLevel;
         auto initialIsCurr = evictionIter.isCurrBucket;
         auto b = getBucketFromIter(evictionIter);
+
+        // Check to see if we can finish scanning the bucket before it receives
+        // an update
+        auto period = bucketUpdatePeriod(evictionIter.bucketListLevel,
+                                         evictionIter.isCurrBucket);
+
+        // Ledgers remaining until the current Bucket changes
+        auto ledgersRemainingToScanBucket = period - (ledgerSeq % period);
+        auto bytesRemaining = b->getSize() - evictionIter.bucketFileOffset;
+        if (ledgersRemainingToScanBucket * scanSize < bytesRemaining)
+        {
+            CLOG_WARNING(Bucket,
+                         "Bucket too large for current eviction scan size.");
+            incompleteBucketScanCounter.inc();
+        }
+
         while (!b->scanForEviction(
             ltx, evictionIter, scanSize, maxEntriesToEvict, ledgerSeq,
             entriesEvictedMeter, bytesScannedForEvictionCounter))
@@ -926,17 +942,6 @@ BucketList::scanForEviction(Application& app, AbstractLedgerTxn& ltx,
             }
 
             b = getBucketFromIter(evictionIter);
-
-            // Check to see if we can finish scanning the new bucket before it
-            // receives an update
-            auto period = bucketUpdatePeriod(evictionIter.bucketListLevel,
-                                             evictionIter.isCurrBucket);
-            if (period * scanSize < b->getSize())
-            {
-                CLOG_WARNING(
-                    Bucket, "Bucket too large for current eviction scan size.");
-                incompleteBucketScanCounter.inc();
-            }
         }
 
         networkConfig.updateEvictionIterator(ltx, evictionIter);