svn commit: r1311177 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java

[fp...@apache.org]

Author: fpj
Date: Mon Apr  9 09:42:01 2012
New Revision: 1311177

URL: http://svn.apache.org/viewvc?rev=1311177&view=rev
Log:
BOOKKEEPER-212: Bookie stops responding when creating and deleting many ledgers (sijie via fpj)


Added:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java
Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1311177&r1=1311176&r2=1311177&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Apr  9 09:42:01 2012
@@ -78,6 +78,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-135: Fencing does not check the ledger masterPasswd (ivank)
 
+	BOOKKEEPER-212: Bookie stops responding when creating and deleting many ledgers (sijie via fpj)
+
       hedwig-server/
       
         BOOKKEEPER-140: Hub server doesn't subscribe remote region correctly when a region is down. (Sijie Gou via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java?rev=1311177&r1=1311176&r2=1311177&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java Mon Apr  9 09:42:01 2012
@@ -615,8 +615,8 @@ public class LedgerCacheImpl implements 
         FileInfo fi = null;
         try {
             fi = getFileInfo(ledgerId, null);
-            fi.delete();
             fi.close(false);
+            fi.delete();
         } finally {
             // should release use count
             // otherwise the file channel would not be closed.

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java?rev=1311177&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java Mon Apr  9 09:42:01 2012
@@ -0,0 +1,74 @@
+package org.apache.bookkeeper.test;
+
+/*
+ *
+ * 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.
+ *
+ */
+
+import java.util.ArrayList;
+
+import org.apache.bookkeeper.client.LedgerHandle;
+import org.apache.bookkeeper.client.BookKeeper.DigestType;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test Create/Delete ledgers
+ */
+public class LedgerCreateDeleteTest extends BookKeeperClusterTestCase {
+
+    public LedgerCreateDeleteTest() {
+        super(1);
+    }
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        baseConf.setOpenFileLimit(1); 
+        super.setUp();
+    }
+
+    @Test
+    public void testCreateDeleteLedgers() throws Exception {
+        int numLedgers = 3;
+        ArrayList<Long> ledgers = new ArrayList<Long>();
+        for (int i=0; i<numLedgers; i++) {
+            LedgerHandle lh = bkc.createLedger(1, 1, DigestType.CRC32, "bk is cool".getBytes());
+            for (int j=0; j<5; j++) {
+                lh.addEntry("just test".getBytes());
+            }
+            ledgers.add(lh.getId());
+            lh.close();
+        }
+        for (long ledgerId : ledgers) {
+            bkc.deleteLedger(ledgerId);
+        }
+        ledgers.clear();
+        Thread.sleep(baseConf.getGcWaitTime() * 2);
+        for (int i=0; i<numLedgers; i++) {
+            LedgerHandle lh = bkc.createLedger(1, 1, DigestType.CRC32, "bk is cool".getBytes());
+            for (int j=0; j<5; j++) {
+                lh.addEntry("just test".getBytes());
+            }
+            ledgers.add(lh.getId());
+            lh.close();
+        }
+    }
+}