[hbase] branch branch-2 updated: HBASE-23812 [Flakey Test] TestReplicator#testReplicatorWithErrors: AssertionError: We did not replicate enough rows expected:<10> but was:<7>

[stack]

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

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 29fb52b  HBASE-23812 [Flakey Test] 
TestReplicator#testReplicatorWithErrors: AssertionError: We did not replicate 
enough rows expected:<10> but was:<7>
29fb52b is described below

commit 29fb52b5d213991b20df8b2daed9bd2d26f5b741
Author: stack <st...@apache.org>
AuthorDate: Fri Feb 7 14:27:45 2020 -0800

    HBASE-23812 [Flakey Test] TestReplicator#testReplicatorWithErrors: 
AssertionError: We did not replicate enough rows expected:<10> but was:<7>
---
 .../regionserver/HBaseInterClusterReplicationEndpoint.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
index 83918c9..efd742d 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
@@ -357,8 +357,8 @@ public class HBaseInterClusterReplicationEndpoint extends 
HBaseReplicationEndpoi
       } catch (InterruptedException ie) {
         iox = new IOException(ie);
       } catch (ExecutionException ee) {
-        // cause must be an IOException
-        iox = (IOException) ee.getCause();
+        iox = ee.getCause() instanceof IOException?
+          (IOException)ee.getCause(): new IOException(ee.getCause());
       }
     }
     if (iox != null) {