Author: ivank
Date: Mon Nov 26 15:42:55 2012
New Revision: 1413685
URL: http://svn.apache.org/viewvc?rev=1413685&view=rev
Log:
BOOKKEEPER-460: LedgerDeleteTest checks wrong place for log file (Fangmin Lv
via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1413685&r1=1413684&r2=1413685&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Nov 26 15:42:55 2012
@@ -106,6 +106,8 @@ Trunk (unreleased changes)
BOOKKEEPER-466: ZooKeeper test utility sets the port number as the
tickTime (ivank)
+ BOOKKEEPER-460: LedgerDeleteTest checks wrong place for log file
(Fangmin Lv via ivank)
+
hedwig-protocol:
BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via
sijie)
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java?rev=1413685&r1=1413684&r2=1413685&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
Mon Nov 26 15:42:55 2012
@@ -28,6 +28,7 @@ import org.apache.bookkeeper.client.Ledg
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
+import org.apache.bookkeeper.util.TestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -132,27 +133,6 @@ public class CompactionTest extends Book
}
}
- private boolean[] checkLogFiles(File ledgerDirectory, int numFiles) {
- boolean[] hasLogFiles = new boolean[numFiles];
- Arrays.fill(hasLogFiles, false);
- for (File f : Bookie.getCurrentDirectory(ledgerDirectory).listFiles())
{
- LOG.info("Checking file : " + f);
- if (f.isFile()) {
- String name = f.getName();
- if (!name.endsWith(".log")) {
- continue;
- }
- String idString = name.split("\\.")[0];
- int id = Integer.parseInt(idString, 16);
- if (id >= numFiles) {
- continue;
- }
- hasLogFiles[id] = true;
- }
- }
- return hasLogFiles;
- }
-
@Test
public void testDisableCompaction() throws Exception {
// prepare data
@@ -175,8 +155,8 @@ public class CompactionTest extends Book
// entry logs ([0,1].log) should not be compacted.
for (File ledgerDirectory : tmpDirs) {
- boolean[] hasLogFiles = checkLogFiles(ledgerDirectory, 2);
- assertTrue("Not Found entry log file ([0,1].log that should have
been compacted in ledgerDirectory: " + ledgerDirectory, hasLogFiles[0] &
hasLogFiles[1]);
+ assertTrue("Not Found entry log file ([0,1].log that should have
been compacted in ledgerDirectory: "
+ + ledgerDirectory,
TestUtils.hasLogFiles(ledgerDirectory, false, 0, 1));
}
}
@@ -205,8 +185,8 @@ public class CompactionTest extends Book
// entry logs ([0,1,2].log) should be compacted.
for (File ledgerDirectory : tmpDirs) {
- boolean[] hasLog = checkLogFiles(ledgerDirectory, 3);
- assertFalse("Found entry log file ([0,1,2].log that should have
not been compacted in ledgerDirectory: " + ledgerDirectory, hasLog[0] |
hasLog[1] | hasLog[2]);
+ assertFalse("Found entry log file ([0,1,2].log that should have
not been compacted in ledgerDirectory: "
+ + ledgerDirectory,
TestUtils.hasLogFiles(ledgerDirectory, true, 0, 1, 2));
}
// even entry log files are removed, we still can access entries for
ledger1
@@ -240,9 +220,8 @@ public class CompactionTest extends Book
// entry logs ([0,1,2].log) should be compacted
for (File ledgerDirectory : tmpDirs) {
- boolean[] hasLogFiles = checkLogFiles(ledgerDirectory, 3);
assertFalse("Found entry log file ([0,1,2].log that should have
not been compacted in ledgerDirectory: "
- + ledgerDirectory, hasLogFiles[0] | hasLogFiles[1] |
hasLogFiles[2]);
+ + ledgerDirectory,
TestUtils.hasLogFiles(ledgerDirectory, true, 0, 1, 2));
}
// even entry log files are removed, we still can access entries for
ledger2
@@ -268,9 +247,8 @@ public class CompactionTest extends Book
// entry logs ([0,1,2].log) should not be compacted
for (File ledgerDirectory : tmpDirs) {
- boolean[] hasLogFiles = checkLogFiles(ledgerDirectory, 3);
assertTrue("Not Found entry log file ([1,2].log that should have
been compacted in ledgerDirectory: "
- + ledgerDirectory, hasLogFiles[0] & hasLogFiles[1] &
hasLogFiles[2]);
+ + ledgerDirectory, TestUtils.hasLogFiles(ledgerDirectory,
false, 0, 1, 2));
}
}
@@ -304,12 +282,10 @@ public class CompactionTest extends Book
// entry logs (0.log) should not be compacted
// entry logs ([1,2,3].log) should be compacted.
for (File ledgerDirectory : tmpDirs) {
- boolean[] hasLog = checkLogFiles(ledgerDirectory, 4);
-
assertTrue("Not Found entry log file ([0].log that should have
been compacted in ledgerDirectory: "
- + ledgerDirectory, hasLog[0]);
+ + ledgerDirectory, TestUtils.hasLogFiles(ledgerDirectory,
true, 0));
assertFalse("Found entry log file ([1,2,3].log that should have
not been compacted in ledgerDirectory: "
- + ledgerDirectory, hasLog[1] | hasLog[2] | hasLog[3]);
+ + ledgerDirectory,
TestUtils.hasLogFiles(ledgerDirectory, true, 1, 2, 3));
}
// even entry log files are removed, we still can access entries for
ledger1
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java?rev=1413685&r1=1413684&r2=1413685&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
Mon Nov 26 15:42:55 2012
@@ -22,9 +22,9 @@ package org.apache.bookkeeper.test;
*/
import java.io.File;
-
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
+import org.apache.bookkeeper.util.TestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.Before;
@@ -106,10 +106,8 @@ public class LedgerDeleteTest extends Mu
// 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"));
- }
+ assertFalse("Found the entry log file (0.log) that should have
been deleted in ledgerDirectory: "
+ + ledgerDirectory, TestUtils.hasLogFiles(ledgerDirectory,
true, 0));
}
}
@@ -147,10 +145,8 @@ public class LedgerDeleteTest extends Mu
* 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")));
- }
+ assertFalse("Found the entry log file ([0,1].log) that should have
been deleted in ledgerDirectory: "
+ + ledgerDirectory, TestUtils.hasLogFiles(ledgerDirectory,
true, 0, 1));
}
}
