You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/09/08 09:18:23 UTC

svn commit: r1701733 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java

Author: mreutegg
Date: Tue Sep  8 07:18:23 2015
New Revision: 1701733

URL: http://svn.apache.org/r1701733
Log:
OAK-3365: Wording in Log statements inconsistent

Consistent working based on Jörg Hoh's suggestion

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1701733&r1=1701732&r2=1701733&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java Tue Sep  8 07:18:23 2015
@@ -87,14 +87,15 @@ public class VersionGarbageCollector {
         final long oldestRevTimeStamp = nodeStore.getClock().getTime() - maxRevisionAgeInMillis;
         final Revision headRevision = nodeStore.getHeadRevision();
 
-        log.info("Starting revision garbage collection. Revisions older than [{}] would be " +
+        log.info("Starting revision garbage collection. Revisions older than [{}] will be " +
                 "removed", Utils.timestampToString(oldestRevTimeStamp));
 
         //Check for any registered checkpoint which prevent the GC from running
         Revision checkpoint = nodeStore.getCheckpoints().getOldestRevisionToKeep();
         if (checkpoint != null && checkpoint.getTimestamp() < oldestRevTimeStamp) {
-            log.info("Ignoring version gc as valid checkpoint [{}] found while " +
-                            "need to collect versions older than [{}]", checkpoint.toReadableString(),
+            log.info("Ignoring revision garbage collection because a valid " +
+                            "checkpoint [{}] was found, which is older than [{}].",
+                    checkpoint.toReadableString(),
                     Utils.timestampToString(oldestRevTimeStamp)
             );
             stats.ignoredGCDueToCheckPoint = true;
@@ -105,7 +106,7 @@ public class VersionGarbageCollector {
         collectSplitDocuments(stats, oldestRevTimeStamp);
 
         sw.stop();
-        log.info("Version garbage collected in {}. {}", sw, stats);
+        log.info("Revision garbage collection finished in {}. {}", sw, stats);
         return stats;
     }