[bookkeeper] branch master updated: Disable testConcurrentWriteAndReadCalls in EntryLogTest

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli 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 e5b144c  Disable testConcurrentWriteAndReadCalls in EntryLogTest
e5b144c is described below

commit e5b144cf45dd176d0369e7dc0ada2bb53e34d912
Author: Sijie Guo <si...@apache.org>
AuthorDate: Fri Jul 20 13:51:48 2018 +0200

    Disable testConcurrentWriteAndReadCalls in EntryLogTest
    
    Descriptions of the changes in this PR:
    
    *Motivation*
    
    Those tests passed locally. However they are taking very long time to 
complete and cause all CI jobs become very flaky.
    In order to unblock all PRs, disable these tests in EntryLogTest.
    
    *Changes*
    
    Marked 4 tests in EntryLogTest as `FlakyTest`.
    
    Relate Issue: #1516
    
    Author: Sijie Guo <si...@apache.org>
    
    Reviewers: Enrico Olivelli <eolive...@gmail.com>
    
    This closes #1561 from sijie/disable_some_entrylog_test
---
 .../org/apache/bookkeeper/bookie/BookieStorageThresholdTest.java | 4 ++--
 .../src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieStorageThresholdTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieStorageThresholdTest.java
index ce084b3..6f7d1c9 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieStorageThresholdTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieStorageThresholdTest.java
@@ -34,13 +34,13 @@ import 
org.apache.bookkeeper.bookie.LedgerDirsManager.LedgerDirsListener;
 import 
org.apache.bookkeeper.bookie.LedgerDirsManager.NoWritableLedgerDirException;
 import org.apache.bookkeeper.client.BookKeeper.DigestType;
 import org.apache.bookkeeper.client.LedgerHandle;
+import org.apache.bookkeeper.common.testing.annotations.FlakyTest;
 import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.apache.bookkeeper.proto.BookieServer;
 import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
 import org.apache.bookkeeper.util.DiskChecker;
 import org.apache.bookkeeper.util.TestUtils;
 import org.junit.Before;
-import org.junit.Test;
 
 /**
  * Test BookieStorage with a threshold.
@@ -140,7 +140,7 @@ public class BookieStorageThresholdTest extends 
BookKeeperClusterTestCase {
         }
     }
 
-    @Test
+    @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/1562";)
     public void testStorageThresholdCompaction() throws Exception {
         stopAllBookies();
         ServerConfiguration conf = newServerConfiguration();
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index 2fd84ad..1dc535c 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -55,6 +55,7 @@ import java.util.concurrent.locks.Lock;
 
 import org.apache.bookkeeper.bookie.EntryLogger.BufferedLogChannel;
 import 
org.apache.bookkeeper.bookie.LedgerDirsManager.NoWritableLedgerDirException;
+import org.apache.bookkeeper.common.testing.annotations.FlakyTest;
 import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.util.DiskChecker;
@@ -636,7 +637,7 @@ public class EntryLogTest {
      * test concurrent write operations and then concurrent read operations
      * using InterleavedLedgerStorage.
      */
-    @Test
+    @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/1516";)
     public void testConcurrentWriteAndReadCallsOfInterleavedLedgerStorage() 
throws Exception {
         
testConcurrentWriteAndReadCalls(InterleavedLedgerStorage.class.getName(), 
false);
     }
@@ -645,7 +646,7 @@ public class EntryLogTest {
      * test concurrent write operations and then concurrent read operations
      * using InterleavedLedgerStorage with EntryLogPerLedger enabled.
      */
-    @Test
+    @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/1516";)
     public void 
testConcurrentWriteAndReadCallsOfInterleavedLedgerStorageWithELPLEnabled() 
throws Exception {
         
testConcurrentWriteAndReadCalls(InterleavedLedgerStorage.class.getName(), true);
     }
@@ -654,7 +655,7 @@ public class EntryLogTest {
      * test concurrent write operations and then concurrent read operations
      * using SortedLedgerStorage.
      */
-    @Test
+    @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/1516";)
     public void testConcurrentWriteAndReadCallsOfSortedLedgerStorage() throws 
Exception {
         testConcurrentWriteAndReadCalls(SortedLedgerStorage.class.getName(), 
false);
     }
@@ -663,7 +664,7 @@ public class EntryLogTest {
      * test concurrent write operations and then concurrent read operations
      * using SortedLedgerStorage with EntryLogPerLedger enabled.
      */
-    @Test
+    @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/1516";)
     public void 
testConcurrentWriteAndReadCallsOfSortedLedgerStorageWithELPLEnabled() throws 
Exception {
         testConcurrentWriteAndReadCalls(SortedLedgerStorage.class.getName(), 
true);
     }