fix for h2database#3909

andreitokar · Feb 19, 2024 · a32bc67 · a32bc67
1 parent 4497462
commit a32bc67
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/h2/src/main/org/h2/mvstore/FileStore.java b/h2/src/main/org/h2/mvstore/FileStore.java
@@ -423,7 +423,7 @@ public final void setAutoCommitDelay(int millis) {
                 stopBackgroundThread(millis >= 0);
                 // start the background thread if needed
                 if (millis > 0 && mvStore.isOpen()) {
-                    int sleep = Math.max(1, millis / 10);
+                    int sleep = Math.max(1, millis / 5);
                     BackgroundWriterThread t = new BackgroundWriterThread(this, sleep, toString());
                     if (backgroundWriterThread.compareAndSet(null, t)) {
                         t.start();
@@ -622,7 +622,7 @@ protected final boolean hasPersistentData() {
     }
 
     protected final boolean isIdle() {
-        return autoCompactLastFileOpCount == getWriteCount() + getReadCount();
+        return autoCompactLastFileOpCount >= getWriteCount() + getReadCount();
     }
 
     protected final void setLastChunk(C last) {
@@ -1835,7 +1835,8 @@ void writeInBackground() {
                     mvStore.tryCommit();
                 }
                 doHousekeeping(mvStore);
-                autoCompactLastFileOpCount = getWriteCount() + getReadCount();
+                // less than 10 I/O operations will still count as "idle"
+                autoCompactLastFileOpCount = getWriteCount() + getReadCount() + 10;
             }
         } catch (InterruptedException ignore) {
         } catch (Throwable e) {

diff --git a/h2/src/main/org/h2/mvstore/RandomAccessStore.java b/h2/src/main/org/h2/mvstore/RandomAccessStore.java
@@ -703,45 +703,46 @@ private void shrinkIfPossible(int minPercent) {
     @Override
     protected void doHousekeeping(MVStore mvStore) throws InterruptedException {
         boolean idle = isIdle();
-        if (idle && stopIdleHousekeeping) {
+        if (idle && stopIdleHousekeeping && getRewritableChunksFillRate() >= getTargetFillRate(idle)) {
             return;
         }
         int autoCommitMemory = mvStore.getAutoCommitMemory();
         int fillRate = getFillRate();
         if (isFragmented() && fillRate < getAutoCompactFillRate()) {
             mvStore.tryExecuteUnderStoreLock(() -> {
                 int moveSize = 2 * autoCommitMemory;
-                if (isIdle()) {
+                if (idle) {
                     moveSize *= 4;
                 }
                 compactMoveChunks(101, moveSize, mvStore);
                 return true;
             });
         }
 
-        int chunksFillRate = getRewritableChunksFillRate();
-        int adjustedChunksFillRate = 100 - (100 - chunksFillRate) / 2;
-        int fillRateToCompare = isIdle() ? chunksFillRate : adjustedChunksFillRate;
-        if (fillRateToCompare < getTargetFillRate()) {
+        int chunksFillRate = getChunksFillRate();
+        int rewritableChunksFillRate = getRewritableChunksFillRate();
+        int adjustedChunksFillRate = 100 - (100 - rewritableChunksFillRate) / 2;
+        int fillRateToCompare = idle ? rewritableChunksFillRate : adjustedChunksFillRate;
+        if (fillRateToCompare < getTargetFillRate(idle)) {
             mvStore.tryExecuteUnderStoreLock(() -> {
                 int writeLimit = autoCommitMemory;
-                if (!isIdle()) {
+                if (!idle) {
                     writeLimit /= 4;
                 }
-                if (rewriteChunks(writeLimit, isIdle() ? adjustedChunksFillRate : chunksFillRate)) {
+                if (rewriteChunks(writeLimit, idle ? adjustedChunksFillRate : rewritableChunksFillRate)) {
                     dropUnusedChunks();
                 }
                 return true;
             });
         }
-        stopIdleHousekeeping = idle && getFillRate() <= fillRate && getRewritableChunksFillRate() <= chunksFillRate;
+        stopIdleHousekeeping = idle && getFillRate() <= fillRate && getChunksFillRate() <= chunksFillRate;
     }
 
-    private int getTargetFillRate() {
+    private int getTargetFillRate(boolean idle) {
         int targetRate = getAutoCompactFillRate();
         // use a lower fill rate if there were any file operations since the last time
-        if (!isIdle()) {
-            targetRate /= 2;
+        if (!idle && targetRate > 50) {
+            targetRate = 2 * targetRate - 100;
         }
         return targetRate;
     }