You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/12/18 01:12:30 UTC
[1/2] hive git commit: HIVE-12699 : LLAP: hive.llap.daemon.work.dirs
setting backward compat name doesn't work (Sergey Shelukhin,
reviewed by Gopal V)
Repository: hive
Updated Branches:
refs/heads/branch-2.0 fa1295f03 -> 410c42ed0
refs/heads/master 783a35a42 -> 2e95037c1
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/2e95037c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2e95037c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2e95037c
Branch: refs/heads/master
Commit: 2e95037c193895e3d3beb84cb95acc132c396448
Parents: 783a35a
Author: Sergey Shelukhin <se...@apache.org>
Authored: Thu Dec 17 16:11:49 2015 -0800
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Thu Dec 17 16:11:49 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/2e95037c/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
[2/2] hive git commit: HIVE-12699 : LLAP: hive.llap.daemon.work.dirs
setting backward compat name doesn't work (Sergey Shelukhin,
reviewed by Gopal V)
Posted by se...@apache.org.
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 <se...@apache.org>
Authored: Thu Dec 17 16:11:49 2015 -0800
Committer: Sergey Shelukhin <se...@apache.org>
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