HIVE-12699 : LLAP: hive.llap.daemon.work.dirs setting backward compat name doesn't work (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/410c42ed Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/410c42ed Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/410c42ed Branch: refs/heads/branch-2.0 Commit: 410c42ed0d6be658dcd1894c06f27692281e5773 Parents: fa1295f Author: Sergey Shelukhin <[email protected]> Authored: Thu Dec 17 16:11:49 2015 -0800 Committer: Sergey Shelukhin <[email protected]> Committed: Thu Dec 17 16:12:10 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/410c42ed/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 7ce8ba0..e1ecf64 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 @@ -277,7 +277,9 @@ public class LlapDaemon extends CompositeService implements ContainerRunner, Lla LlapConfiguration daemonConf = new LlapConfiguration(); int numExecutors = HiveConf.getIntVar(daemonConf, ConfVars.LLAP_DAEMON_NUM_EXECUTORS); - String[] localDirs = daemonConf.getTrimmedStrings(ConfVars.LLAP_DAEMON_WORK_DIRS.varname); + String localDirList = HiveConf.getVar(daemonConf, ConfVars.LLAP_DAEMON_WORK_DIRS); + String[] localDirs = (localDirList == null || localDirList.isEmpty()) ? + new String[0] : StringUtils.getTrimmedStrings(localDirList); int rpcPort = HiveConf.getIntVar(daemonConf, ConfVars.LLAP_DAEMON_RPC_PORT); int mngPort = HiveConf.getIntVar(daemonConf, ConfVars.LLAP_MANAGEMENT_RPC_PORT); int shufflePort = daemonConf
