OOZIE-2619 Make Hive action defaults to match hive defaults when running from command line (venkatnrangan via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b4c75a3c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b4c75a3c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b4c75a3c Branch: refs/heads/oya Commit: b4c75a3c64db7c1d84dbc3485e0e73817b70a29f Parents: 2712526 Author: abhisek bafna <aba...@hortonworks.com> Authored: Wed Jan 25 12:15:12 2017 +0530 Committer: abhisek bafna <aba...@hortonworks.com> Committed: Wed Jan 25 12:15:12 2017 +0530 ---------------------------------------------------------------------- core/src/main/conf/action-conf/hive.xml | 41 +++++++++++++++----- .../oozie/action/hadoop/JavaActionExecutor.java | 2 +- release-log.txt | 1 + 3 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b4c75a3c/core/src/main/conf/action-conf/hive.xml ---------------------------------------------------------------------- diff --git a/core/src/main/conf/action-conf/hive.xml b/core/src/main/conf/action-conf/hive.xml index 2076bd4..7ae0f95 100644 --- a/core/src/main/conf/action-conf/hive.xml +++ b/core/src/main/conf/action-conf/hive.xml @@ -18,18 +18,41 @@ limitations under the License. --> <configuration> - <!-- An example of setting default properties for Hive action. - This could be useful with Hadoop versions that have deprecated - HADOOP_HOME that Hive still relies on. - <property> - <name>hadoop.bin.path</name> - <value>/usr/bin/hadoop</value> + <name>mapreduce.job.reduces</name> + <value>-1</value> </property> <property> - <name>hadoop.config.dir</name> - <value>/etc/hadoop/conf</value> + <name>mapreduce.input.fileinputformat.split.maxsize</name> + <value>256000000L</value> + </property> + <property> + <name>mapreduce.input.fileinputformat.input.dir.recursive</name> + <value>false</value> + </property> + <property> + <name>mapreduce.input.fileinputformat.input.dir.recursive</name> + <value>false</value> + </property> + <property> + <name>mapreduce.input.fileinputformat.split.minsize.per.node</name> + <value>1</value> + </property> + <property> + <name>mapreduce.input.fileinputformat.split.minsize.per.rack</name> + <value>1</value> + </property> + <property> + <name>mapreduce.reduce.speculative</name> + <value>true</value> + </property> + <property> + <name>mapreduce.job.committer.setup.cleanup.needed</name> + <value>false</value> + </property> + <property> + <name>mapreduce.job.committer.task.cleanup.needed</name> + <value>false</value> </property> - --> </configuration> http://git-wip-us.apache.org/repos/asf/oozie/blob/b4c75a3c/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index 4beeb96..cc27fa0 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -532,7 +532,7 @@ public class JavaActionExecutor extends ActionExecutor { try { HadoopAccessorService has = Services.get().get(HadoopAccessorService.class); XConfiguration actionDefaults = has.createActionDefaultConf(actionConf.get(HADOOP_JOB_TRACKER), getType()); - XConfiguration.injectDefaults(actionDefaults, actionConf); + XConfiguration.copy(actionDefaults, actionConf); has.checkSupportedFilesystem(appPath.toUri()); // Set the Java Main Class for the Java action to give to the Java launcher http://git-wip-us.apache.org/repos/asf/oozie/blob/b4c75a3c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 513b283..503d3c0 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2619 Make Hive action defaults to match hive defaults when running from command line (venkatnrangan via abhishekbafna) OOZIE-2776 Log message is repeated twice for hive actions (satishsaley) OOZIE-2691 Show workflow action retry information in UI (puru) OOZIE-2709 Log the substituted pig script by expanding macros (satishsaley)