jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1177648 - in /jackrabbit/trunk: jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/ jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/
Date Fri, 30 Sep 2011 13:31:31 GMT
Author: reschke
Date: Fri Sep 30 13:31:29 2011
New Revision: 1177648

URL: http://svn.apache.org/viewvc?rev=1177648&view=rev
Log:
JCR 3006 - UserManager: concurrent user creation using same intermediate path fails - updated
javadoc to mention that retries may be necessary, added updated test cases

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ConcurrentCreateUserTest.java
Modified:
    jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/TestAll.java

Modified: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java?rev=1177648&r1=1177647&r2=1177648&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java
Fri Sep 30 13:31:29 2011
@@ -16,16 +16,26 @@
  */
 package org.apache.jackrabbit.api.security.user;
 
-import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import java.security.Principal;
 import java.util.Iterator;
 
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+
 /**
  * The <code>UserManager</code> provides access to and means to maintain
  * {@link Authorizable authorizable objects} i.e. {@link User users} and
  * {@link Group groups}. The <code>UserManager</code> is bound to a particular
  * <code>Session</code>.
+ * <p>
+ * Note that all <code>create</code> calls will modify the session associated
+ * with the {@linkplain UserManager} (whether this is the current session or not
+ * depends on the repository configuration). If the user manager is <em>not</em>
+ * in "autosave" mode (see {@link UserManager#isAutoSave()}), problems like
+ * overlapping creation of intermediate nodes may only surface upon a subsequent
+ * {@link Session#save()} operation; callers should be prepared to repeat them
+ * in case this happens.
  */
 public interface UserManager {
 

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ConcurrentCreateUserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ConcurrentCreateUserTest.java?rev=1177648&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ConcurrentCreateUserTest.java
(added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ConcurrentCreateUserTest.java
Fri Sep 30 13:31:29 2011
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.api.security.user;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.core.AbstractConcurrencyTest;
+import org.apache.jackrabbit.core.security.TestPrincipal;
+
+public class ConcurrentCreateUserTest extends AbstractConcurrencyTest {
+
+    /**
+     * The number of threads.
+     */
+    private static final int CONCURRENCY = 5;
+
+    /**
+     * Number of tries per user.
+     */
+    private static final int RETRIES = 3;
+
+    List<String> userIDs = Collections
+            .synchronizedList(new ArrayList<String>());
+    public static final String INTERMEDIATE_PATH = UUID.randomUUID().toString();
+
+    @Override
+    protected void tearDown() throws Exception {
+
+        try {
+            for (String id : userIDs) {
+                Authorizable a = ((JackrabbitSession) superuser)
+                        .getUserManager().getAuthorizable(id);
+                a.remove();
+                superuser.save();
+            }
+        } catch (Exception e) {
+            // this is best effort
+        }
+
+        super.tearDown();
+    }
+
+    public void testCreateUsers() throws Exception {
+
+        log.println("ConcurrentCreateUserTest.testCreateUsers: c="
+                + CONCURRENCY);
+        log.flush();
+
+        runTask(new Task() {
+            public void execute(Session session, Node test)
+                    throws RepositoryException {
+                JackrabbitSession s = null;
+                try {
+                    s = (JackrabbitSession) getHelper().getSuperuserSession();
+
+                    String name = "newname-" + UUID.randomUUID();
+                    Authorizable authorizable = null;
+                    int maxtries = RETRIES;
+                    RepositoryException lastex = null;
+
+                    while (authorizable == null && maxtries > 0) {
+                        try {
+                            maxtries -= 1;
+                            authorizable = s.getUserManager().createUser(name,
+                                    "password1", new TestPrincipal(name),
+                                    INTERMEDIATE_PATH);
+                            s.save();
+                        } catch (InvalidItemStateException ex) {
+                            lastex = ex;
+                            log.println("got " + ex + ", retrying");
+                        }
+                    }
+                    if (authorizable == null) {
+                        throw new RepositoryException("user " + name
+                                + " not created in " + RETRIES + " attempts.",
+                                lastex);
+                    }
+                    userIDs.add(authorizable.getID());
+                    log.println(authorizable + " created");
+                } finally {
+                    s.logout();
+                }
+            }
+        }, CONCURRENCY, "/" + testPath);
+    }
+}

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/TestAll.java?rev=1177648&r1=1177647&r2=1177648&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/TestAll.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/TestAll.java
Fri Sep 30 13:31:29 2011
@@ -42,6 +42,7 @@ public class TestAll extends TestCase {
         suite.addTestSuite(NestedGroupTest.class);
         suite.addTestSuite(ImpersonationTest.class);
         suite.addTestSuite(UserManagerSearchTest.class);
+        suite.addTestSuite(ConcurrentCreateUserTest.class);
 
         return suite;
     }



Mime
View raw message