svn commit: r1608560 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ oak-run/src/main/java/org/apache/jackrabbit/oak/run/

[jukka]

Author: jukka
Date: Mon Jul  7 19:03:15 2014
New Revision: 1608560

URL: http://svn.apache.org/r1608560
Log:
OAK-1932: TarMK compaction can create mixed segments

Adjust the oak-run compact option to correctly trigger the cleanup after 
compaction

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/BackgroundThread.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/BackgroundThread.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/BackgroundThread.java?rev=1608560&r1=1608559&r2=1608560&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/BackgroundThread.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/BackgroundThread.java
 Mon Jul  7 19:03:15 2014
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugin
 
 import static java.lang.System.currentTimeMillis;
 
-import java.util.Calendar;
+import java.util.Date;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@ class BackgroundThread extends Thread {
     public void run() {
         try {
             while (waitUntilNextIteration()) {
-                setName(name + ", active since " + Calendar.getInstance()
+                setName(name + ", active since " + new Date()
                         + ", previous max duration " + maxDuration + "ms");
 
                 long start = currentTimeMillis();

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1608560&r1=1608559&r2=1608560&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 Mon Jul  7 19:03:15 2014
@@ -369,7 +369,7 @@ public class FileStore implements Segmen
         }
     }
 
-    synchronized void cleanup() throws IOException {
+    public synchronized void cleanup() throws IOException {
         long start = System.nanoTime();
         log.info("TarMK revision cleanup started");
 

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1608560&r1=1608559&r2=1608560&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
 Mon Jul  7 19:03:15 2014
@@ -299,8 +299,7 @@ public class Main {
             System.out.println("    -> cleaning up");
             store = new FileStore(directory, 256, false);
             try {
-                store.gc();
-                store.flush();
+                store.cleanup();
             } finally {
                 store.close();
             }