Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: zookeeper-dev@<hadoop.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r944140 - in
 /hadoop/zookeeper/trunk/src/contrib/bookkeeper:
 src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java
 test/org/apache/bookkeeper/test/LedgerDeleteTest.java
Date: Fri, 14 May 2010 07:04:41 -0000
To: zookeeper-commits@hadoop.apache.org
From: fpj@apache.org
Message-Id: <20100514070442.083E523888E8@eris.apache.org>

Author: fpj
Date: Fri May 14 07:04:41 2010
New Revision: 944140

URL: http://svn.apache.org/viewvc?rev=944140&view=rev
Log:
ZOOKEEPER-464. Need procedure to garbage collect ledgers
(erwin via fpj)

OBS: Adding missing files.


Added:
    hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java
    hadoop/zookeeper/trunk/src/contrib/bookkeeper/test/org/apache/bookkeeper/test/LedgerDeleteTest.java

Added: hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java?rev=944140&view=auto
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java (added)
+++ hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/client/LedgerDeleteOp.java Fri May 14 07:04:41 2010
@@ -0,0 +1,80 @@
+/*
+ * 
+ * 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.bookkeeper.client;
+
+import org.apache.bookkeeper.client.AsyncCallback.DeleteCallback;
+import org.apache.bookkeeper.util.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.zookeeper.AsyncCallback.VoidCallback;
+
+/**
+ * Encapsulates asynchronous ledger delete operation
+ * 
+ */
+class LedgerDeleteOp implements VoidCallback {
+
+    static final Logger LOG = Logger.getLogger(LedgerDeleteOp.class);
+
+    BookKeeper bk;
+    long ledgerId;
+    DeleteCallback cb;
+    Object ctx;
+
+    /**
+     * Constructor
+     * 
+     * @param bk
+     *            BookKeeper object
+     * @param ledgerId
+     *            ledger Id
+     * @param cb
+     *            callback implementation
+     * @param ctx
+     *            optional control object
+     */
+    LedgerDeleteOp(BookKeeper bk, long ledgerId, DeleteCallback cb, Object ctx) {
+        this.bk = bk;
+        this.ledgerId = ledgerId;
+        this.cb = cb;
+        this.ctx = ctx;
+    }
+
+    /**
+     * Initiates the operation
+     */
+    public void initiate() {
+        // Asynchronously delete the ledger node in ZK.
+        // When this completes, it will invoke the callback method below.
+        bk.getZkHandle().delete(StringUtils.getLedgerNodePath(ledgerId), -1, this, null);
+    }
+
+    /**
+     * Implements ZooKeeper Void Callback.
+     * 
+     * @see org.apache.zookeeper.AsyncCallback.VoidCallback#processResult(int,
+     *      java.lang.String, java.lang.Object)
+     */
+    public void processResult(int rc, String path, Object ctx) {
+        cb.deleteComplete(rc, this.ctx);
+    }
+
+}

Added: hadoop/zookeeper/trunk/src/contrib/bookkeeper/test/org/apache/bookkeeper/test/LedgerDeleteTest.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/bookkeeper/test/org/apache/bookkeeper/test/LedgerDeleteTest.java?rev=944140&view=auto
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/bookkeeper/test/org/apache/bookkeeper/test/LedgerDeleteTest.java (added)
+++ hadoop/zookeeper/trunk/src/contrib/bookkeeper/test/org/apache/bookkeeper/test/LedgerDeleteTest.java Fri May 14 07:04:41 2010
@@ -0,0 +1,163 @@
+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.io.File;
+
+import org.apache.bookkeeper.client.LedgerHandle;
+import org.apache.bookkeeper.client.BookKeeper.DigestType;
+import org.apache.bookkeeper.proto.BookieServer;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class tests the ledger delete functionality both from the BookKeeper
+ * client and the server side.
+ */
+public class LedgerDeleteTest extends BaseTestCase {
+    static Logger LOG = Logger.getLogger(LedgerDeleteTest.class);
+    DigestType digestType;
+
+    public LedgerDeleteTest(DigestType digestType) {
+        super(3);
+        this.digestType = digestType;
+    }
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        // Set up the configuration properties needed.
+        System.setProperty("logSizeLimit", Long.toString(2 * 1024 * 1024L));
+        System.setProperty("gcWaitTime", "1000");
+        super.setUp();
+    }
+
+    /**
+     * Common method to create ledgers and write entries to them.
+     */
+    private LedgerHandle[] writeLedgerEntries(int numLedgers, int msgSize, int numMsgs) throws Exception {
+        // Create the ledgers
+        LedgerHandle[] lhs = new LedgerHandle[numLedgers];
+        for (int i = 0; i < numLedgers; i++) {
+            lhs[i] = bkc.createLedger(digestType, "".getBytes());
+        }
+
+        // Create a dummy message string to write as ledger entries
+        StringBuilder msgSB = new StringBuilder();
+        for (int i = 0; i < msgSize; i++) {
+            msgSB.append("a");
+        }
+        String msg = msgSB.toString();
+
+        // Write all of the entries for all of the ledgers
+        for (int i = 0; i < numMsgs; i++) {
+            for (int j = 0; j < numLedgers; j++) {
+                lhs[j].addEntry(msg.getBytes());
+            }
+        }
+
+        // Return the ledger handles to the inserted ledgers and entries
+        return lhs;
+    }
+
+    /**
+     * This test writes enough ledger entries to roll over the entry log file.
+     * It will then delete all of the ledgers from the client and let the
+     * server's EntryLogger garbage collector thread delete the initial entry
+     * log file.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testLedgerDelete() throws Exception {
+        // Write enough ledger entries so that we roll over the initial entryLog (0.log)
+        LedgerHandle[] lhs = writeLedgerEntries(3, 1024, 1024);
+
+        // Delete all of these ledgers from the BookKeeper client
+        for (LedgerHandle lh : lhs) {
+            bkc.deleteLedger(lh.getId());
+        }
+        LOG.info("Finished deleting all ledgers so waiting for the GC thread to clean up the entryLogs");
+        Thread.sleep(2000);
+
+        // Verify that the first entry log (0.log) has been deleted from all of the Bookie Servers.
+        for (File ledgerDirectory : tmpDirs) {
+            for (File f : ledgerDirectory.listFiles()) {
+                assertFalse("Found the entry log file (0.log) that should have been deleted in ledgerDirectory: "
+                        + ledgerDirectory, f.isFile() && f.getName().equals("0.log"));
+            }
+        }
+    }
+
+    /**
+     * This test is similar to testLedgerDelete() except it will stop and
+     * restart the Bookie Servers after it has written out the ledger entries.
+     * On restart, there will be existing entry logs and ledger index files for
+     * the EntryLogger and LedgerCache to read and store into memory.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testLedgerDeleteWithExistingEntryLogs() throws Exception {
+        // Write enough ledger entries so that we roll over the initial entryLog (0.log)
+        LedgerHandle[] lhs = writeLedgerEntries(3, 1024, 1024);
+
+        /*
+         * Shutdown the Bookie Servers and restart them using the same ledger
+         * directories. This will test the reading of pre-existing ledger index
+         * files in the LedgerCache during startup of a Bookie Server.
+         */
+        for (BookieServer server : bs) {
+            server.shutdown();
+        }
+        bs.clear();
+        int j = 0;
+        for (File f : tmpDirs) {
+            BookieServer server = new BookieServer(initialPort + j, HOSTPORT, f, new File[] { f });
+            server.start();
+            bs.add(server);
+            j++;
+        }
+
+        // Delete all of these ledgers from the BookKeeper client
+        for (LedgerHandle lh : lhs) {
+            bkc.deleteLedger(lh.getId());
+        }
+        LOG.info("Finished deleting all ledgers so waiting for the GC thread to clean up the entryLogs");
+        Thread.sleep(2000);
+
+        /*
+         * Verify that the first two entry logs ([0,1].log) have been deleted
+         * from all of the Bookie Servers. When we restart the servers in this
+         * test, a new entry log is created. We know then that the first two
+         * entry logs should be deleted.
+         */
+        for (File ledgerDirectory : tmpDirs) {
+            for (File f : ledgerDirectory.listFiles()) {
+                assertFalse("Found the entry log file ([0,1].log) that should have been deleted in ledgerDirectory: "
+                        + ledgerDirectory, f.isFile() && (f.getName().equals("0.log") || f.getName().equals("1.log")));
+            }
+        }
+    }
+
+}