svn commit: r1813878 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file: FileStore.java TarRevisions.java

[frm]

Author: frm
Date: Tue Oct 31 12:47:11 2017
New Revision: 1813878

URL: http://svn.apache.org/viewvc?rev=1813878&view=rev
Log:
OAK-6829 - Add debug messages whenever a flush operation is skipped

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

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1813878&r1=1813877&r2=1813878&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 Tue Oct 31 12:47:11 2017
@@ -316,6 +316,7 @@ public class FileStore extends AbstractF
 
     private void doFlush() throws IOException {
         if (revisions == null) {
+            log.debug("No TarRevisions available, skipping flush");
             return;
         }
         revisions.flush(() -> {

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java?rev=1813878&r1=1813877&r2=1813878&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarRevisions.java
 Tue Oct 31 12:47:11 2017
@@ -191,17 +191,21 @@ public class TarRevisions implements Rev
      */
     public void flush(@Nonnull Callable<Void> persisted) throws IOException {
         if (head.get() == null) {
+            LOG.debug("No head available, skipping flush");
             return;
         }
         if (journalFileLock.tryLock()) {
             try {
                 if (journalFile == null) {
+                    LOG.debug("No journal file available, skipping flush");
                     return;
                 }
                 doFlush(persisted);
             } finally {
                 journalFileLock.unlock();
             }
+        } else {
+            LOG.debug("Unable to lock the journal, skipping flush");
         }
     }
 
@@ -209,7 +213,9 @@ public class TarRevisions implements Rev
         try {
             RecordId before = persistedHead.get();
             RecordId after = getHead();
-            if (!after.equals(before)) {
+            if (after.equals(before)) {
+                LOG.debug("Head state did not change, skipping flush");
+            } else {
                 persisted.call();
                 LOG.debug("TarMK journal update {} -> {}", before, after);
                 journalFile.writeBytes(after.toString10() + " root " + 
System.currentTimeMillis() + "\n");