svn commit: r1766000 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

[tomekr]

Author: tomekr
Date: Fri Oct 21 11:38:21 2016
New Revision: 1766000

URL: http://svn.apache.org/viewvc?rev=1766000&view=rev
Log:
OAK-4970: Optimize the version copying performance during sidegrade

Log a warning message if the workspace name can't be derived from content

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1766000&r1=1765999&r2=1766000&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Fri Oct 21 11:38:21 2016
@@ -82,7 +82,7 @@ public class RepositorySidegrade {
 
     private static final int LOG_NODE_COPY = 
Integer.getInteger("oak.upgrade.logNodeCopy", 10000);
 
-    private static final String WORKSPACE_NAME = 
System.getProperty("oak.upgrade.workspaceName");
+    private static final String WORKSPACE_NAME_PROP = 
"oak.upgrade.workspaceName";
 
     /**
      * Target node store.
@@ -436,7 +436,7 @@ public class RepositorySidegrade {
     }
 
     private String getWorkspaceName() {
-        return find(asList(WORKSPACE_NAME, deriveWorkspaceName(), 
DEFAULT_WORKSPACE_NAME), notNull());
+        return find(asList(System.getProperty(WORKSPACE_NAME_PROP), 
deriveWorkspaceName(), DEFAULT_WORKSPACE_NAME), notNull());
     }
 
     /**
@@ -458,6 +458,7 @@ public class RepositorySidegrade {
         if (nameCandidates.size() == 1) {
             return nameCandidates.get(0);
         } else {
+            LOG.warn("Can't find the workspace name. '{}' will be used. It can 
be overriden with system property {}", DEFAULT_WORKSPACE_NAME, 
WORKSPACE_NAME_PROP);
             return null;
         }
     }