Author: reschke
Date: Mon Jun 4 12:35:43 2018
New Revision: 1832831
URL: http://svn.apache.org/viewvc?rev=1832831&view=rev
Log:
OAK-7471: add a config switch to disable locking
(reverted for now)
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockDeprecation.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Mon Jun 4 12:35:43 2018
@@ -75,8 +75,6 @@ import javax.jcr.security.AccessControlE
import com.google.common.base.Function;
import com.google.common.base.Predicate;
-
-import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
@@ -84,7 +82,6 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.api.Tree.Status;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.jcr.lock.LockDeprecation;
import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
@@ -381,9 +378,6 @@ public class NodeDelegate extends ItemDe
}
public boolean canAddMixin(String typeName) throws RepositoryException {
- if (!LockDeprecation.isLockingSupported() &&
JcrConstants.MIX_LOCKABLE.equals(typeName)) {
- return false;
- }
Tree type =
sessionDelegate.getRoot().getTree(NODE_TYPES_PATH).getChild(typeName);
if (type.exists()) {
return !TreeUtil.getBoolean(type, JCR_IS_ABSTRACT)
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockDeprecation.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockDeprecation.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockDeprecation.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockDeprecation.java
Mon Jun 4 12:35:43 2018
@@ -21,8 +21,6 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.jcr.UnsupportedRepositoryOperationException;
-
import org.apache.jackrabbit.oak.jcr.session.NodeImpl;
import org.apache.jackrabbit.oak.jcr.session.SessionImpl;
import org.slf4j.Logger;
@@ -35,9 +33,6 @@ public class LockDeprecation {
private static final Logger LOG =
LoggerFactory.getLogger(LockDeprecation.class);
- private static final String LOCKSUPPORT =
System.getProperty("oak.locksupport", "deprecated");
- private static final boolean ISLOCKINGSUPPORTED =
!("disabled".equals(LOCKSUPPORT));
-
private LockDeprecation() {
}
@@ -49,25 +44,16 @@ public class LockDeprecation {
new String[] { Thread.class.getName(),
java.lang.reflect.Method.class.getName(), LockDeprecation.class.getName(),
LockManagerImpl.class.getName(), NodeImpl.class.getName(),
SessionImpl.class.getName() }));
- public static void logCall(String operation) throws
UnsupportedRepositoryOperationException {
+ public static void logCall(String operation) {
- if (!ISLOCKINGSUPPORTED) {
- throw new UnsupportedRepositoryOperationException(
- "Support for JCR Locking is disabled (see OAK-6421 for
further information)");
- } else {
- boolean firstInvocation = NOTWARNEDYET.getAndSet(false);
-
- if (firstInvocation) {
- String explanation = "Support for JCR Locking is deprecated
and will be disabled in a future version of Jackrabbit Oak (see OAK-6421 for
further information)";
- LOG.warn(explanation + " - " + createLogMessage(operation));
- } else if (LOG.isTraceEnabled()) {
- LOG.trace(createLogMessage(operation));
- }
- }
- }
+ boolean firstInvocation = NOTWARNEDYET.getAndSet(false);
- public final static boolean isLockingSupported() {
- return ISLOCKINGSUPPORTED;
+ if (firstInvocation) {
+ String explanation = "Support for JCR Locking is deprecated and
will be disabled in a future version of Jackrabbit Oak (see OAK-6421 for
further information)";
+ LOG.warn(explanation + " - " + createLogMessage(operation));
+ } else if (LOG.isTraceEnabled()) {
+ LOG.trace(createLogMessage(operation));
+ }
}
private static String createLogMessage(String operation) {
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/JcrDescriptorsImpl.java
Mon Jun 4 12:35:43 2018
@@ -20,7 +20,6 @@ import javax.jcr.Value;
import javax.jcr.ValueFactory;
import org.apache.jackrabbit.oak.api.Descriptors;
-import org.apache.jackrabbit.oak.jcr.lock.LockDeprecation;
import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors;
import static javax.jcr.Repository.OPTION_LOCKING_SUPPORTED;
@@ -38,7 +37,7 @@ public class JcrDescriptorsImpl extends
// add the descriptors of the features that are provided by the JCR
layer
final Value trueValue = valueFactory.createValue(true);
- put(OPTION_LOCKING_SUPPORTED,
valueFactory.createValue(LockDeprecation.isLockingSupported()), true, true);
+ put(OPTION_LOCKING_SUPPORTED, trueValue, true, true);
put(OPTION_XML_EXPORT_SUPPORTED, trueValue, true, true);
put(OPTION_XML_IMPORT_SUPPORTED, trueValue, true, true);
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Mon Jun 4 12:35:43 2018
@@ -1208,9 +1208,6 @@ public class NodeImpl<T extends NodeDele
@Override
public boolean isLocked() throws RepositoryException {
- if (!LockDeprecation.isLockingSupported()) {
- return false;
- }
return getLockManager().isLocked(getPath());
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
Mon Jun 4 12:35:43 2018
@@ -657,8 +657,7 @@ public class SessionImpl implements Jack
if (!parent.isCheckedOut()) {
return false;
}
- boolean hasLocking =
sessionContext.getRepository().getDescriptorValue(Repository.OPTION_LOCKING_SUPPORTED).getBoolean();
- if (hasLocking && parent.isLocked()) {
+ if (parent.isLocked()) {
return false;
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
Mon Jun 4 12:35:43 2018
@@ -44,7 +44,6 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate;
import org.apache.jackrabbit.oak.jcr.delegate.WorkspaceDelegate;
-import org.apache.jackrabbit.oak.jcr.lock.LockDeprecation;
import org.apache.jackrabbit.oak.jcr.lock.LockManagerImpl;
import org.apache.jackrabbit.oak.jcr.query.QueryManagerImpl;
import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation;
@@ -198,8 +197,7 @@ public class WorkspaceImpl implements Ja
}
@Override
- public LockManagerImpl getLockManager() throws
UnsupportedRepositoryOperationException {
- LockDeprecation.logCall("get LockManager");
+ public LockManagerImpl getLockManager() {
return new LockManagerImpl(sessionContext);
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Mon Jun 4 12:35:43 2018
@@ -49,7 +49,6 @@ import org.apache.jackrabbit.oak.jcr.del
import org.apache.jackrabbit.oak.jcr.delegate.VersionDelegate;
import org.apache.jackrabbit.oak.jcr.delegate.VersionHistoryDelegate;
import org.apache.jackrabbit.oak.jcr.delegate.VersionManagerDelegate;
-import org.apache.jackrabbit.oak.jcr.lock.LockDeprecation;
import org.apache.jackrabbit.oak.jcr.lock.LockManagerImpl;
import org.apache.jackrabbit.oak.jcr.session.SessionContext;
import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation;
@@ -390,15 +389,12 @@ public class VersionManagerImpl implemen
}
private void checkNotLocked(String absPath) throws RepositoryException {
- if (!LockDeprecation.isLockingSupported()) {
- return;
- }
// TODO: avoid nested calls
LockManagerImpl lockManager =
sessionContext.getWorkspace().getLockManager();
if (lockManager.isLocked(absPath)) {
NodeDelegate node =
sessionContext.getSessionDelegate().getNode(absPath);
if (!lockManager.canUnlock(node)) {
- throw new LockException("Node at " + absPath + " is locked");
+ throw new LockException("Node at " + absPath + " is locked");
}
}
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1832831&r1=1832830&r2=1832831&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Mon Jun 4 12:35:43 2018
@@ -31,7 +31,6 @@ import javax.jcr.ImportUUIDBehavior;
import javax.jcr.ItemExistsException;
import javax.jcr.PathNotFoundException;
import javax.jcr.PropertyType;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
@@ -148,8 +147,7 @@ public class ImporterImpl implements Imp
if (!vMgr.isCheckedOut(absPath)) {
throw new VersionException("Target node is checked in.");
}
- boolean hasLocking =
sessionContext.getRepository().getDescriptorValue(Repository.OPTION_LOCKING_SUPPORTED).getBoolean();
- if (importTargetTree.getStatus() != Tree.Status.NEW && hasLocking &&
wsp.getLockManager().isLocked(absPath)) {
+ if (importTargetTree.getStatus() != Tree.Status.NEW &&
wsp.getLockManager().isLocked(absPath)) {
throw new LockException("Target node is locked.");
}
effectiveNodeTypeProvider = wsp.getNodeTypeManager();
