You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/03/30 18:03:51 UTC
[49/50] [abbrv] hbase git commit: HBASE-15295
MutateTableAccess.multiMutate() does not get high priority causing a deadlock
- ADDENDUM for failing test
HBASE-15295 MutateTableAccess.multiMutate() does not get high priority causing a deadlock - ADDENDUM for failing test
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/afdfd1bd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/afdfd1bd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/afdfd1bd
Branch: refs/heads/hbase-12439
Commit: afdfd1bd9c938fa4b5c2aa9346e559167d550785
Parents: 7f39baf
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Mar 29 15:02:18 2016 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Mar 29 15:02:18 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/HConnectionTestingUtility.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/afdfd1bd/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
index dc1ecf1..24ef5b2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java
@@ -125,6 +125,7 @@ public class HConnectionTestingUtility {
Mockito.when(c.getNewRpcRetryingCallerFactory(conf)).thenReturn(
RpcRetryingCallerFactory.instantiate(conf,
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, null));
+ Mockito.when(c.getRpcControllerFactory()).thenReturn(Mockito.mock(RpcControllerFactory.class));
HTableInterface t = Mockito.mock(HTableInterface.class);
Mockito.when(c.getTable((TableName)Mockito.any())).thenReturn(t);
ResultScanner rs = Mockito.mock(ResultScanner.class);