Repository: hive Updated Branches: refs/heads/branch-2.0 83c2e219a -> 66538fe81
HIVE-12687 : LLAP Workdirs need to default to YARN local (Sergey Shelukhin, reviewed by Gopal V) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/66538fe8 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/66538fe8 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/66538fe8 Branch: refs/heads/branch-2.0 Commit: 66538fe81623e748c97d9fef89df90f3141d7adb Parents: 83c2e21 Author: Sergey Shelukhin <[email protected]> Authored: Tue Jan 12 13:38:37 2016 -0800 Committer: Sergey Shelukhin <[email protected]> Committed: Tue Jan 12 13:43:23 2016 -0800 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 3 ++- .../java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/66538fe8/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 33d4bc0..efc1f6f 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2414,7 +2414,8 @@ public class HiveConf extends Configuration { "Number of RPC handlers for LLAP daemon.", "llap.daemon.rpc.num.handlers"), LLAP_DAEMON_WORK_DIRS("hive.llap.daemon.work.dirs", "", "Working directories for the daemon. Needs to be set for a secure cluster, since LLAP may\n" + - "not have access to the default YARN working directories.", "llap.daemon.work.dirs"), + "not have access to the default YARN working directories. yarn.nodemanager.local-dirs is\n" + + "used if this is not set", "llap.daemon.work.dirs"), LLAP_DAEMON_YARN_SHUFFLE_PORT("hive.llap.daemon.yarn.shuffle.port", 15551, "YARN shuffle port for LLAP-daemon-hosted shuffle.", "llap.daemon.yarn.shuffle.port"), LLAP_DAEMON_YARN_CONTAINER_MB("hive.llap.daemon.yarn.container.mb", -1, http://git-wip-us.apache.org/repos/asf/hive/blob/66538fe8/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java index 917ff32..ddedfbf 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java @@ -286,6 +286,9 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla int numExecutors = HiveConf.getIntVar(daemonConf, ConfVars.LLAP_DAEMON_NUM_EXECUTORS); String localDirList = HiveConf.getVar(daemonConf, ConfVars.LLAP_DAEMON_WORK_DIRS); + if (localDirList == null || localDirList.isEmpty()) { + localDirList = daemonConf.get("yarn.nodemanager.local-dirs"); + } String[] localDirs = (localDirList == null || localDirList.isEmpty()) ? new String[0] : StringUtils.getTrimmedStrings(localDirList); int rpcPort = HiveConf.getIntVar(daemonConf, ConfVars.LLAP_DAEMON_RPC_PORT);
