Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BookKeeper 4.2.2 release.

  • Loading branch information...
commit 16c7a1c3da07952a329f75fea95f43563d6173f0 2 parents 44c9b1d + aecf2d2
@ivankelly ivankelly authored
View
8 CHANGES.txt
@@ -1,4 +1,4 @@
-Release 4.2.2 - 2013-09-10
+Release 4.2.2 - 2013-10-02
Backward compatible changes:
@@ -6,6 +6,8 @@ Release 4.2.2 - 2013-09-10
BOOKKEEPER-635: jenkins build should highlight which lines of the patch cause raw analysis errors (ivank via sijie)
+ BOOKKEEPER-684: ZK logging is oververbose, can cause oom in tests (ivank via fpj)
+
bookkeeper-server:
BOOKKEEPER-559: Fix occasional failure in AuditorBookieTest (ivank)
@@ -82,6 +84,8 @@ Release 4.2.2 - 2013-09-10
BOOKKEEPER-627: LedgerDirsMonitor is missing thread name (rakeshr via ivank)
+ BOOKKEEPER-685: Race in compaction algorithm from BOOKKEEPER-664 (ivank)
+
hedwig-server:
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
@@ -90,6 +94,8 @@ Release 4.2.2 - 2013-09-10
BOOKKEEPER-607: Filtered Messages Require ACK from Client Causes User Being Throttled Incorrectly Forever (sijie via ivank)
+ BOOKKEEPER-683: TestSubAfterCloseSub fails on 4.2 (jiannan via ivank)
+
hedwig-client:
BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee via ivank)
View
1  bookkeeper-benchmark/src/test/resources/log4j.properties
@@ -33,6 +33,7 @@ log4j.rootLogger=INFO, CONSOLE
# Example with rolling log file and tracing
#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+log4j.logger.org.apache.zookeeper=ERROR
#
# Log INFO level and above messages to the console
View
6 bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
@@ -118,9 +118,9 @@
*/
static interface EntryLogListener {
/**
- * Rotate a new entry log to write.
+ * Callback when entry log is flushed.
*/
- public void onRotateEntryLog();
+ public void onEntryLogFlushed();
}
/**
@@ -350,7 +350,7 @@ synchronized void flush() throws IOException {
}
somethingWritten = false;
for (EntryLogListener listener: listeners) {
- listener.onRotateEntryLog();
+ listener.onEntryLogFlushed();
}
}
View
12 bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
@@ -129,8 +129,8 @@ public void process(final long ledgerId, long offset, ByteBuffer entry)
long entryId = entry.getLong();
entry.rewind();
- flushed.set(false);
long newoffset = entryLogger.addEntry(ledgerId, entry);
+ flushed.set(false);
offsets.add(new Offset(ledgerId, entryId, newoffset));
}
}
@@ -141,7 +141,7 @@ public void process(final long ledgerId, long offset, ByteBuffer entry)
Object flushLock = new Object();
@Override
- public void onRotateEntryLog() {
+ public void onEntryLogFlushed() {
synchronized (flushLock) {
flushed.set(true);
flushLock.notifyAll();
@@ -151,10 +151,14 @@ public void onRotateEntryLog() {
synchronized private void waitEntrylogFlushed() throws IOException {
try {
synchronized (flushLock) {
- while (!flushed.get() && running) {
+ while (!flushed.get()
+ && entryLogger.isFlushRequired()
+ && running) {
flushLock.wait(1000);
}
- if (!flushed.get() && !running) {
+ if (!flushed.get()
+ && entryLogger.isFlushRequired()
+ && !running) {
throw new IOException("Shutdown before flushed");
}
}
View
1  bookkeeper-server/src/test/resources/log4j.properties
@@ -33,6 +33,7 @@ log4j.rootLogger=INFO, CONSOLE
# Example with rolling log file and tracing
#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+log4j.logger.org.apache.zookeeper=ERROR
#
# Log INFO level and above messages to the console
View
2  hedwig-server/src/test/java/org/apache/hedwig/client/TestSubAfterCloseSub.java
@@ -79,10 +79,12 @@ public void run() {
/**
* {@link https://issues.apache.org/jira/browse/BOOKKEEPER-507}
*/
+ /* TODO: Add this test case back after BOOKKEEPER-37 is fixed
@Test(timeout=15000)
public void testSubAfterCloseSubForSimpleClient() throws Exception {
runSubAfterCloseSubTest(false);
}
+ */
/**
* {@link https://issues.apache.org/jira/browse/BOOKKEEPER-507}
View
1  hedwig-server/src/test/resources/log4j.properties
@@ -33,6 +33,7 @@ log4j.rootLogger=INFO, CONSOLE
# Example with rolling log file and tracing
#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+log4j.logger.org.apache.zookeeper=ERROR
#
# Log INFO level and above messages to the console
Please sign in to comment.
Something went wrong with that request. Please try again.