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 fr...@apache.org on 2015/09/28 16:43:53 UTC

svn commit: r1705701 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java

Author: frm
Date: Mon Sep 28 14:43:53 2015
New Revision: 1705701

URL: http://svn.apache.org/viewvc?rev=1705701&view=rev
Log:
OAK-3454 - Improve the logging capabilities of offline compaction

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java

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=1705701&r1=1705700&r2=1705701&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 Sep 28 14:43:53 2015
@@ -481,7 +481,7 @@ public final class Main {
                     + " bytes)");
 
             System.out.println("    -> compacting");
-            FileStore store = new FileStore(directory, 256, TAR_STORAGE_MEMORY_MAPPED);
+            FileStore store = openFileStore(directory);
             try {
                 CompactionStrategy compactionStrategy = new CompactionStrategy(
                         false, CompactionStrategy.CLONE_BINARIES_DEFAULT,
@@ -505,7 +505,7 @@ public final class Main {
             }
 
             System.out.println("    -> cleaning up");
-            store = new FileStore(directory, 256, TAR_STORAGE_MEMORY_MAPPED);
+            store = openFileStore(directory);
             try {
                 store.cleanup();
             } finally {
@@ -523,6 +523,14 @@ public final class Main {
         }
     }
 
+    private static FileStore openFileStore(File directory) throws IOException {
+        return FileStore
+                .newFileStore(directory)
+                .withCacheSize(256)
+                .withMemoryMapping(TAR_STORAGE_MEMORY_MAPPED)
+                .create();
+    }
+
     private static void checkpoints(String[] args) throws IOException {
         if (args.length == 0) {
             System.out