Add suppressed exceptions for debugging

neo4j · Sep 30, 2016 · b748e78 · b748e78
1 parent 7e353eb
commit b748e78
Showing 1 changed file with 36 additions and 7 deletions.
diff --git a/stresstests/src/test/java/org/neo4j/coreedge/stresstests/CatchUpLoad.java b/stresstests/src/test/java/org/neo4j/coreedge/stresstests/CatchUpLoad.java
@@ -75,25 +75,54 @@ protected void doWork()
         int newMemberId = cluster.edgeMembers().size();
         final EdgeClusterMember edgeClusterMember = cluster.addEdgeMemberWithId( newMemberId );
 
-        Supplier<Throwable> exception;
+        Throwable ex = null;
+        Supplier<Throwable> monitoredException = null;
         try
         {
-            exception = startAndRegisterExceptionMonitor( edgeClusterMember );
+            monitoredException = startAndRegisterExceptionMonitor( edgeClusterMember );
             await( () -> txIdBeforeStartingNewEdge <= txId( edgeClusterMember, true ), 3, TimeUnit.MINUTES );
         }
-        catch ( Exception e )
+        catch ( Throwable e )
         {
-            throw new RuntimeException( e );
+            ex = e;
         }
         finally
         {
-            cluster.removeEdgeMemberWithMemberId( newMemberId );
+            try
+            {
+                cluster.removeEdgeMemberWithMemberId( newMemberId );
+            }
+            catch ( Throwable e )
+            {
+                ex = exception( ex, e );
+            }
+        }
+
+        if ( monitoredException != null && monitoredException.get() != null )
+        {
+            throw new RuntimeException( exception( monitoredException.get(), ex ) );
+        }
+
+        if ( ex != null )
+        {
+            throw new RuntimeException( ex );
+        }
+    }
+
+    private Throwable exception( Throwable outer, Throwable inner )
+    {
+        if ( outer == null )
+        {
+            assert inner != null;
+            return inner;
         }
 
-        if ( exception.get() != null )
+        if ( inner != null )
         {
-            throw new RuntimeException( exception.get() );
+            outer.addSuppressed( inner );
         }
+
+        return outer;
     }
 
     private Supplier<Throwable> startAndRegisterExceptionMonitor( EdgeClusterMember edgeClusterMember )