You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ss...@apache.org on 2016/05/25 21:59:45 UTC
[2/2] hive git commit: HIVE-13720. Fix failing test -
TestLlapTaskCommunicator. (Siddharth Seth,
reviewed by Sergey Shelukhin) (cherry picked from commit
b93ce7825ef095bfcf1bd3474f110773c35ea9ab)
HIVE-13720. Fix failing test - TestLlapTaskCommunicator. (Siddharth Seth, reviewed by Sergey Shelukhin)
(cherry picked from commit b93ce7825ef095bfcf1bd3474f110773c35ea9ab)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/84627689
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/84627689
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/84627689
Branch: refs/heads/branch-2.1
Commit: 84627689e60bad4bea3ce5996a9aca6a88f11d6d
Parents: 4082d70
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed May 25 14:58:34 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Wed May 25 14:59:51 2016 -0700
----------------------------------------------------------------------
.../hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/84627689/llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java
----------------------------------------------------------------------
diff --git a/llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java b/llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java
index 8e2d0ac..1901328 100644
--- a/llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java
+++ b/llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java
@@ -36,6 +36,7 @@ import java.util.concurrent.locks.ReentrantLock;
import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.llap.LlapNodeId;
import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos;
import org.apache.hadoop.hive.llap.tez.LlapProtocolClientProxy;
@@ -273,11 +274,15 @@ public class TestLlapTaskCommunicator {
final TezVertexID vertexId1 = TezVertexID.getInstance(dagid, 300);
final TezVertexID vertexId2 = TezVertexID.getInstance(dagid, 301);
final Configuration conf = new Configuration(false);
- final UserPayload userPayload = TezUtils.createUserPayloadFromConf(conf);
+ final UserPayload userPayload;
final LlapTaskCommunicatorForTest taskCommunicator;
public LlapTaskCommunicatorWrapperForTest(LlapProtocolClientProxy llapProxy) throws Exception {
+
+ HiveConf.setVar(conf, HiveConf.ConfVars.LLAP_DAEMON_SERVICE_HOSTS, "fake-non-zk-cluster");
+ userPayload = TezUtils.createUserPayloadFromConf(conf);
+
doReturn(appAttemptId).when(taskCommunicatorContext).getApplicationAttemptId();
doReturn(new Credentials()).when(taskCommunicatorContext).getAMCredentials();
doReturn(userPayload).when(taskCommunicatorContext).getInitialUserPayload();