You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/10/03 15:23:06 UTC

hbase git commit: HBASE-21221 Ineffective assertion in TestFromClientSide3#testMultiRowMutations - addendum tightens condition for finding exception

Repository: hbase
Updated Branches:
  refs/heads/master 42aa3dd46 -> b9bb14e0f


HBASE-21221 Ineffective assertion in TestFromClientSide3#testMultiRowMutations - addendum tightens condition for finding exception


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b9bb14e0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b9bb14e0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b9bb14e0

Branch: refs/heads/master
Commit: b9bb14e0fd115f37b627cdc3052336e3bcd0a871
Parents: 42aa3dd
Author: tedyu <yu...@gmail.com>
Authored: Wed Oct 3 08:22:57 2018 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Oct 3 08:22:57 2018 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/client/TestFromClientSide3.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b9bb14e0/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
index aa5bfb0..0dee20b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
@@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.coprocessor.RegionObserver;
+import org.apache.hadoop.hbase.exceptions.UnknownProtocolException;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
 import org.apache.hadoop.hbase.ipc.ServerRpcController;
 import org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos;
@@ -851,7 +852,7 @@ public class TestFromClientSide3 {
               CoprocessorRpcUtils.BlockingRpcCallback<MultiRowMutationProtos.MutateRowsResponse>
                 rpcCallback = new CoprocessorRpcUtils.BlockingRpcCallback<>();
               exe.mutateRows(controller, request, rpcCallback);
-              if (controller.failedOnException()) {
+              if (controller.failedOnException() && !(controller.getFailedOn() instanceof UnknownProtocolException)) {
                 exceptionDuringMutateRows.set(true);
               }
               return rpcCallback.get();