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/1e44dd82 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e44dd82 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e44dd82 Branch: refs/heads/branch-1 Commit: 1e44dd82eb593d1d385ea52e7132c05f9405a5b1 Parents: c7ad428 Author: Enis Soztutar <e...@apache.org> Authored: Tue Mar 29 15:02:18 2016 -0700 Committer: Enis Soztutar <e...@apache.org> Committed: Tue Mar 29 15:02:23 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/1e44dd82/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 306dfee..1a7c2ef 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 @@ -160,6 +160,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);
