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 re...@apache.org on 2016/09/02 09:39:30 UTC
svn commit: r1758924 - in /jackrabbit/oak/trunk/oak-upgrade/src/main:
java/org/apache/jackrabbit/oak/upgrade/cli/node/
java/org/apache/jackrabbit/oak/upgrade/cli/parser/ resources/
Author: reschke
Date: Fri Sep 2 09:39:30 2016
New Revision: 1758924
URL: http://svn.apache.org/viewvc?rev=1758924&view=rev
Log:
OAK-4725: Enable mmap mode by default for migration to SegmentNodeStore - backed out due to test failure on Windows
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java Fri Sep 2 09:39:30 2016
@@ -39,11 +39,11 @@ public class SegmentFactory implements N
private final File dir;
- private final boolean disableMmap;
+ private final boolean mmap;
- public SegmentFactory(String directory, boolean disableMmap) {
+ public SegmentFactory(String directory, boolean mmap) {
this.dir = new File(directory);
- this.disableMmap = disableMmap;
+ this.mmap = mmap;
createDirectoryIfMissing(dir);
if (!dir.isDirectory()) {
throw new IllegalArgumentException("Not a directory: " + dir.getPath());
@@ -62,12 +62,7 @@ public class SegmentFactory implements N
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
- builder.withMaxFileSize(256);
- if (disableMmap) {
- builder.withMemoryMapping(false);
- } else {
- builder.withDefaultMemoryMapping();
- }
+ builder.withMaxFileSize(256).withMemoryMapping(mmap);
final FileStore fs;
try {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java Fri Sep 2 09:39:30 2016
@@ -39,11 +39,11 @@ public class SegmentTarFactory implement
private final File dir;
- private final boolean disableMmap;
+ private final boolean mmap;
- public SegmentTarFactory(String directory, boolean disableMmap) {
+ public SegmentTarFactory(String directory, boolean mmap) {
this.dir = new File(directory);
- this.disableMmap = disableMmap;
+ this.mmap = mmap;
createDirectoryIfMissing(dir);
if (!dir.isDirectory()) {
throw new IllegalArgumentException("Not a directory: " + dir.getPath());
@@ -62,12 +62,7 @@ public class SegmentTarFactory implement
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
- builder.withMaxFileSize(256);
- if (disableMmap) {
- builder.withMemoryMapping(false);
- } else {
- builder.withDefaultMemoryMapping();
- }
+ builder.withMaxFileSize(256).withMemoryMapping(mmap);
final FileStore fs;
try {
fs = builder.build();
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Fri Sep 2 09:39:30 2016
@@ -32,7 +32,7 @@ public class MigrationOptions {
private final boolean copyBinariesByReference;
- private final boolean disableMmap;
+ private final boolean mmap;
private final int cacheSizeInMB;
@@ -60,7 +60,7 @@ public class MigrationOptions {
public MigrationOptions(MigrationCliArguments args) {
this.copyBinariesByReference = !args.hasOption(OptionParserFactory.COPY_BINARIES);
- this.disableMmap = args.hasOption(OptionParserFactory.DISABLE_MMAP);
+ this.mmap = args.hasOption(OptionParserFactory.MMAP);
if (args.hasOption(OptionParserFactory.CACHE_SIZE)) {
this.cacheSizeInMB = args.getIntOption(OptionParserFactory.CACHE_SIZE);
} else {
@@ -95,8 +95,8 @@ public class MigrationOptions {
return copyBinariesByReference;
}
- public boolean isDisableMmap() {
- return disableMmap;
+ public boolean isMmap() {
+ return mmap;
}
public int getCacheSizeInMB() {
@@ -154,8 +154,8 @@ public class MigrationOptions {
log.info("Binary content would be copied to the NodeStore.");
}
- if (disableMmap) {
- log.info("Disabling memory mapped file access for Segment Store");
+ if (mmap) {
+ log.info("Enabling memory mapped file access for Segment Store");
}
if (copyVersions == null) {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java Fri Sep 2 09:39:30 2016
@@ -24,7 +24,7 @@ public class OptionParserFactory {
public static final String COPY_BINARIES = "copy-binaries";
- public static final String DISABLE_MMAP = "disable-mmap";
+ public static final String MMAP = "mmap";
public static final String FAIL_ON_ERROR = "fail-on-error";
@@ -140,7 +140,7 @@ public class OptionParserFactory {
}
private static void addMiscOptions(OptionParser op) {
- op.accepts(DISABLE_MMAP, "Disable memory mapped file access for Segment Store");
+ op.accepts(MMAP, "Enable memory mapped file access for Segment Store");
op.accepts(FAIL_ON_ERROR, "Fail completely if nodes can't be read from the source repo");
op.accepts(EARLY_SHUTDOWN,
"Shutdown the source repository after nodes are copied and before the commit hooks are applied");
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java Fri Sep 2 09:39:30 2016
@@ -128,7 +128,7 @@ public enum StoreType {
@Override
public StoreFactory createFactory(String[] paths, MigrationDirection direction, MigrationCliArguments arguments) {
String path = removeStart(paths[0], SEGMENT_OLD_PREFIX);
- return new StoreFactory(new SegmentFactory(path, arguments.getOptions().isDisableMmap()));
+ return new StoreFactory(new SegmentFactory(path, arguments.getOptions().isMmap()));
}
@Override
@@ -144,7 +144,7 @@ public enum StoreType {
@Override
public StoreFactory createFactory(String[] paths, MigrationDirection direction, MigrationCliArguments arguments) {
- return new StoreFactory(new SegmentTarFactory(paths[0], arguments.getOptions().isDisableMmap()));
+ return new StoreFactory(new SegmentTarFactory(paths[0], arguments.getOptions().isMmap()));
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt?rev=1758924&r1=1758923&r2=1758924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt Fri Sep 2 09:39:30 2016
@@ -42,7 +42,7 @@ An descriptor of the Oak node store. Pos
# node store options
--cache <int> Cache size in MB (default: 256)
---disable-mmap Disable memory mapped file access for Segment Store
+--mmap Enable memory mapped file access for Segment Store
--src-password Source rdb password
--src-user Source rdb user