svn commit: r1764039 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java

[al...@apache.org]

Author: alexparvulescu
Date: Mon Oct 10 09:38:34 2016
New Revision: 1764039

URL: http://svn.apache.org/viewvc?rev=1764039&view=rev
Log:
OAK-4901 Improve SizeDeltaGcEstimation logging
 - patch by Valentin Olteanu

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java?rev=1764039&r1=1764038&r2=1764039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SizeDeltaGcEstimation.java Mon Oct 10 09:38:34 2016
@@ -75,22 +75,26 @@ public class SizeDeltaGcEstimation imple
                     delta);
         } else if (getPreviousCleanupSize() < 0) {
             gcNeeded = true;
-            gcInfo = format("Estimation skipped because of missing gc journal data");
+            gcInfo = "Estimation skipped because of missing gc journal data (expected on first run)";
         } else {
             long lastGc = getPreviousCleanupSize();
             long gain = totalSize - lastGc;
             long gainP = 100 * (totalSize - lastGc) / totalSize;
             gcNeeded = gain > delta;
+            gcInfo = format(
+                    "Segmentstore size has increased since the last compaction from %s (%s bytes) to %s (%s bytes), " +
+                    "an increase of %s (%s bytes) or %s%%. ",
+                    humanReadableByteCount(lastGc), lastGc,
+                    humanReadableByteCount(totalSize), totalSize,
+                    humanReadableByteCount(gain), gain, gainP);
             if (gcNeeded) {
-                gcInfo = format(
-                        "Size delta is %s%% or %s/%s (%s/%s bytes), so running compaction",
-                        gainP, humanReadableByteCount(lastGc),
-                        humanReadableByteCount(totalSize), lastGc, totalSize);
+                gcInfo = gcInfo + format(
+                        "This is greater than sizeDeltaEstimation=%s (%s bytes), so running compaction",
+                        humanReadableByteCount(delta), delta);
             } else {
-                gcInfo = format(
-                        "Size delta is %s%% or %s/%s (%s/%s bytes), so skipping compaction for now",
-                        gainP, humanReadableByteCount(lastGc),
-                        humanReadableByteCount(totalSize), lastGc, totalSize);
+                gcInfo = gcInfo + format(
+                        "This is less than sizeDeltaEstimation=%s (%s bytes), so skipping compaction",
+                        humanReadableByteCount(delta), delta);
             }
         }
         finished = true;