You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2019/02/11 14:18:40 UTC

svn commit: r1853379 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java

Author: mduerig
Date: Mon Feb 11 14:18:40 2019
New Revision: 1853379

URL: http://svn.apache.org/viewvc?rev=1853379&view=rev
Log:
OAK-8039: Intermittent test failure of CompactionAndCleanupIT.testMixedSegments
Include stack traces of exceptions in background thread

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java?rev=1853379&r1=1853378&r2=1853379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java Mon Feb 11 14:18:40 2019
@@ -659,7 +659,7 @@ public class CompactionAndCleanupIT {
         collectSegments(store.getReader(), store.getRevisions(), beforeSegments);
 
         final AtomicReference<Boolean> run = new AtomicReference<Boolean>(true);
-        final List<String> failedCommits = newArrayList();
+        final List<Exception> failedCommits = newArrayList();
         Thread[] threads = new Thread[10];
         for (int k = 0; k < threads.length; k++) {
             final int threadId = k;
@@ -677,7 +677,7 @@ public class CompactionAndCleanupIT {
                             Thread.interrupted();
                             break;
                         } catch (Exception e) {
-                            failedCommits.add(nodeName);
+                            failedCommits.add(new ExecutionException("Failed commit " + nodeName, e));
                         }
                     }
                 }
@@ -692,7 +692,9 @@ public class CompactionAndCleanupIT {
         store.flush();
 
         assumeTrue("Failed to acquire compaction lock", compactionSuccess.get());
-        assertTrue("Failed commits: " + failedCommits, failedCommits.isEmpty());
+        for (Exception failedCommit : failedCommits) {
+            throw new Exception("A background commit failed", failedCommit);
+        }
 
         Set<UUID> afterSegments = new HashSet<UUID>();
         collectSegments(store.getReader(), store.getRevisions(), afterSegments);