Author: frm
Date: Mon Nov 27 16:05:12 2017
New Revision: 1816471
URL: http://svn.apache.org/viewvc?rev=1816471&view=rev
Log:
OAK-6991 - The console command should not silently upgrade the FileStore
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java?rev=1816471&r1=1816470&r2=1816471&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
Mon Nov 27 16:05:12 2017
@@ -19,6 +19,11 @@
package org.apache.jackrabbit.oak.run.cli;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.emptyMap;
+import static
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getService;
+
import java.io.File;
import java.io.IOException;
@@ -33,11 +38,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Collections.emptyMap;
-import static
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
-import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getService;
-
class SegmentTarFixtureProvider {
static NodeStore configureSegment(Options options, BlobStore blobStore,
Whiteboard wb, Closer closer, boolean readOnly)
@@ -66,6 +66,7 @@ class SegmentTarFixtureProvider {
wb.register(ReadOnlyFileStore.class, fileStore, emptyMap());
} else {
FileStore fileStore = builder
+ .withStrictVersionCheck(true)
.withStatisticsProvider(statisticsProvider)
.build();
closer.register(fileStore);