Index: src/main/java/org/apache/jackrabbit/oak/run/Main.java
===================================================================
--- src/main/java/org/apache/jackrabbit/oak/run/Main.java	(revision 1655007)
+++ src/main/java/org/apache/jackrabbit/oak/run/Main.java	(working copy)
@@ -41,6 +41,7 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -91,6 +92,7 @@
 import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
 import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
 import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
@@ -461,6 +463,21 @@
             System.out.println("    -> compacting");
             FileStore store = new FileStore(directory, 256, TAR_STORAGE_MEMORY_MAPPED);
             try {
+                CompactionStrategy compactionStrategy = new CompactionStrategy(
+                        CompactionStrategy.PAUSE_DEFAULT, 
+                        CompactionStrategy.CLONE_BINARIES_DEFAULT, 
+                        CompactionStrategy.CLEANUP_DEFAULT, 
+                        CompactionStrategy.TIMESTAMP_DEFAULT,
+                        CompactionStrategy.MEMORY_THRESHOLD_DEFAULT) {
+                    @Override
+                    public boolean compacted(Callable<Boolean> setHead) throws Exception {
+                    	// oak-run is doing compaction single-threaded
+                    	// hence no guarding needed - go straight ahead
+                    	// and call setHead
+                    	return setHead.call();
+                    }
+                };
+                store.setCompactionStrategy(compactionStrategy);
                 store.compact();
             } finally {
                 store.close();