Treat closed channel as benign failure in backup stress tests

neo4j · Sep 28, 2018 · 0223a93 · 0223a93
1 parent fc8b325
commit 0223a93
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/BackupHelper.java b/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/BackupHelper.java
@@ -24,7 +24,9 @@
 
 import java.io.File;
 import java.net.ConnectException;
+import java.nio.channels.ClosedChannelException;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.neo4j.backup.impl.OnlineBackupCommandBuilder;
@@ -36,10 +38,16 @@
 import static org.neo4j.backup.impl.SelectedBackupProtocol.CATCHUP;
 import static org.neo4j.causalclustering.core.CausalClusteringSettings.transaction_advertised_address;
 import static org.neo4j.helpers.Exceptions.findCauseOrSuppressed;
+import static org.neo4j.helpers.collection.Iterators.asSet;
 import static org.neo4j.io.NullOutputStream.NULL_OUTPUT_STREAM;
 
 class BackupHelper
 {
+    private static final Set<Class<? extends Throwable>> BENIGN_EXCEPTIONS = asSet(
+            ConnectException.class,
+            ClosedChannelException.class
+    );
+
     AtomicLong backupNumber = new AtomicLong();
     AtomicLong successfulBackups = new AtomicLong();
 
@@ -82,10 +90,10 @@ Optional<File> backup( ClusterMember member ) throws Exception
         }
         catch ( CommandFailed e )
         {
-            Optional<Throwable> connectException = findCauseOrSuppressed( e, t -> t instanceof ConnectException );
+            Optional<Throwable> benignException = findCauseOrSuppressed( e, t -> BENIGN_EXCEPTIONS.contains( t.getClass() ) );
-            if ( connectException.isPresent() )
+            if ( benignException.isPresent() )
             {
-                log.info( "Benign failure: " + connectException.get().getMessage() );
+                log.info( "Benign failure: " + benignException.get().getMessage() );
             }
             else
             {