Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E75610847 for ; Tue, 3 Sep 2013 08:17:26 +0000 (UTC) Received: (qmail 88567 invoked by uid 500); 3 Sep 2013 08:17:26 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 88546 invoked by uid 500); 3 Sep 2013 08:17:21 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 88521 invoked by uid 99); 3 Sep 2013 08:17:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Sep 2013 08:17:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Sep 2013 08:17:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3DD2323888A6; Tue, 3 Sep 2013 08:16:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519591 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: ConcurrentReadTest.java ConcurrentReadWriteTest.java Date: Tue, 03 Sep 2013 08:16:48 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130903081648.3DD2323888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Tue Sep 3 08:16:47 2013 New Revision: 1519591 URL: http://svn.apache.org/r1519591 Log: OAK-990: ConcurrentRead(Write)Test leaks session Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadTest.java jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadWriteTest.java Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadTest.java?rev=1519591&r1=1519590&r2=1519591&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadTest.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadTest.java Tue Sep 3 08:16:47 2013 @@ -33,25 +33,25 @@ public class ConcurrentReadTest extends private static final int READER_COUNT = getScale(20); - private Session session; - - protected Node root; - @Override public void beforeSuite() throws Exception { - session = getRepository().login( + Session session = getRepository().login( new SimpleCredentials("admin", "admin".toCharArray())); - root = session.getRootNode().addNode("testroot", "nt:unstructured"); - for (int i = 0; i < NODE_COUNT; i++) { - Node node = root.addNode("node" + i, "nt:unstructured"); - for (int j = 0; j < NODE_COUNT; j++) { - node.addNode("node" + j, "nt:unstructured"); + try { + Node root = session.getRootNode().addNode("testroot", "nt:unstructured"); + for (int i = 0; i < NODE_COUNT; i++) { + Node node = root.addNode("node" + i, "nt:unstructured"); + for (int j = 0; j < NODE_COUNT; j++) { + node.addNode("node" + j, "nt:unstructured"); + } + session.save(); } - session.save(); - } - for (int i = 0; i < READER_COUNT; i++) { - addBackgroundJob(new Reader()); + for (int i = 0; i < READER_COUNT; i++) { + addBackgroundJob(new Reader()); + } + } finally { + session.logout(); } } @@ -88,13 +88,20 @@ public class ConcurrentReadTest extends @Override public void afterSuite() throws Exception { - for (int i = 0; i < NODE_COUNT; i++) { - root.getNode("node" + i).remove(); + Session session = getRepository().login( + new SimpleCredentials("admin", "admin".toCharArray())); + try { + Node root = session.getRootNode().getNode("testroot"); + for (int i = 0; i < NODE_COUNT; i++) { + root.getNode("node" + i).remove(); + session.save(); + } + + root.remove(); session.save(); + } finally { + session.logout(); } - - root.remove(); - session.save(); } } Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadWriteTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadWriteTest.java?rev=1519591&r1=1519590&r2=1519591&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadWriteTest.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentReadWriteTest.java Tue Sep 3 08:16:47 2013 @@ -48,12 +48,16 @@ public class ConcurrentReadWriteTest ext try { session = getRepository().login( new SimpleCredentials("admin", "admin".toCharArray())); - int i = random.nextInt(NODE_COUNT); - int j = random.nextInt(NODE_COUNT); - Node node = session.getRootNode().getNode( - "testroot/node" + i + "/node" + j); - node.setProperty("count", count++); - session.save(); + try { + int i = random.nextInt(NODE_COUNT); + int j = random.nextInt(NODE_COUNT); + Node node = session.getRootNode().getNode( + "testroot/node" + i + "/node" + j); + node.setProperty("count", count++); + session.save(); + } finally { + session.logout(); + } } catch (RepositoryException e) { throw new RuntimeException(e); }