This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 7b04ce8 ISSUE #1490: BookieJournalForceTest is flaky
7b04ce8 is described below
commit 7b04ce80fd56250afa37efcb60b61a1bf235256a
Author: Sijie Guo <[email protected]>
AuthorDate: Tue Jun 12 19:29:15 2018 -0700
ISSUE #1490: BookieJournalForceTest is flaky
Descriptions of the changes in this PR:
### Motivation
The test cases in BookieJournalForceTest check if the forceWriteQueue is
empty after everything is flushed.
However if `adaptiveGroupWrites` is enabled, the forceWrite thread will
insert a marker entry into force write queue,
this will fail the forceWriteQueue length checking.
### Changes
Disable `adaptiveGroupWrites` in BookieJournalForceTest
Master Issue: #1490
Author: Sijie Guo <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Jia Zhai <None>
This closes #1512 from sijie/fix_journalforcetest, closes #1490
---
.../org/apache/bookkeeper/bookie/BookieJournalForceTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
index 3a8ad86..76daa7d 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
@@ -78,7 +78,8 @@ public class BookieJournalForceTest {
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration()
.setJournalDirName(journalDir.getPath())
- .setMetadataServiceUri(null);
+ .setMetadataServiceUri(null)
+ .setJournalAdaptiveGroupWrites(false);
JournalChannel jc = spy(new JournalChannel(journalDir, 1));
whenNew(JournalChannel.class).withAnyArguments().thenReturn(jc);
@@ -140,7 +141,8 @@ public class BookieJournalForceTest {
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(journalDir.getPath())
- .setMetadataServiceUri(null);
+ .setMetadataServiceUri(null)
+ .setJournalAdaptiveGroupWrites(false);
JournalChannel jc = spy(new JournalChannel(journalDir, 1));
whenNew(JournalChannel.class).withAnyArguments().thenReturn(jc);
@@ -195,7 +197,8 @@ public class BookieJournalForceTest {
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(journalDir.getPath())
.setJournalBufferedEntriesThreshold(journalBufferedEntriesThreshold)
- .setMetadataServiceUri(null);
+ .setMetadataServiceUri(null)
+ .setJournalAdaptiveGroupWrites(false);
JournalChannel jc = spy(new JournalChannel(journalDir, 1));
whenNew(JournalChannel.class).withAnyArguments().thenReturn(jc);
@@ -321,6 +324,7 @@ public class BookieJournalForceTest {
ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(journalDir.getPath());
+ conf.setJournalAdaptiveGroupWrites(false);
JournalChannel jc = spy(new JournalChannel(journalDir, 1));
whenNew(JournalChannel.class).withAnyArguments().thenReturn(jc);
--
To stop receiving notification emails like this one, please contact
[email protected].
