[GitHub] sijie closed pull request #1512: Issue 1490: BookieJournalForceTest is flaky

[GitBox <gi...@apache.org>]

sijie closed pull request #1512: Issue 1490: BookieJournalForceTest is flaky
URL: https://github.com/apache/bookkeeper/pull/1512
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 3a8ad8646..76daa7d56 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 void testAckAfterSync() throws Exception {
 
         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 void testAckBeforeSync() throws Exception {
 
         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 void testAckBeforeSyncWithJournalBufferedEntriesThreshold() throws Except
         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 void testForceLedger() throws Exception {
 
         ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
         conf.setJournalDirName(journalDir.getPath());
+        conf.setJournalAdaptiveGroupWrites(false);
 
         JournalChannel jc = spy(new JournalChannel(journalDir, 1));
         whenNew(JournalChannel.class).withAnyArguments().thenReturn(jc);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services