Repository: ambari Updated Branches: refs/heads/trunk ed327bd53 -> 348bdd668
AMBARI-22613 - Hive Queries Failing with Missing SnappyCodec Compression Type Due to Hive's Use of MapReduce Admin Env Property (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/348bdd66 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/348bdd66 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/348bdd66 Branch: refs/heads/trunk Commit: 348bdd668ecf6964e2c021aeddf547b3f9bb23bf Parents: ed327bd Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Thu Dec 7 15:51:51 2017 -0500 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Dec 8 07:17:51 2017 -0500 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 2 ++ .../common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py | 1 + .../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml | 2 +- .../YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml | 2 +- .../src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index ea8beaf..20e61d3 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -109,7 +109,9 @@ stack_supports_hive_interactive_ga = check_stack_feature(StackFeature.HIVE_INTER component_directory = status_params.component_directory component_directory_interactive = status_params.component_directory_interactive +# used to render hadoop configurations, such as writing out its own mapreduce2 configs hadoop_home = stack_select.get_hadoop_dir("home") +hadoop_lib_home = stack_select.get_hadoop_dir("lib") hive_bin = format('{stack_root}/current/{component_directory}/bin') hive_cmd = os.path.join(hive_bin, "hive") http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py index 088a540..8bff1c9 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py @@ -106,6 +106,7 @@ component_directory = status_params.component_directory component_directory_interactive = status_params.component_directory_interactive hadoop_home = stack_select.get_hadoop_dir("home") +hadoop_lib_home = stack_select.get_hadoop_dir("lib") hive_bin = format('{stack_root}/current/{component_directory}/bin') hive_cmd = os.path.join(hive_bin, "hive") http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml index 398c9d7..d2359f3 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml @@ -438,7 +438,7 @@ </property> <property> <name>mapreduce.admin.user.env</name> - <value>LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64</value> + <value>LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64</value> <description> Additional execution environment entries for map and reduce task processes. This is not an additive property. You must preserve the original value if http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml index 3b31db1..5498321 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml @@ -438,7 +438,7 @@ </property> <property> <name>mapreduce.admin.user.env</name> - <value>LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64</value> + <value>LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64</value> <description> Additional execution environment entries for map and reduce task processes. This is not an additive property. You must preserve the original value if http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index 9311877..9c3d0dd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -285,7 +285,7 @@ <changes> <definition xsi:type="configure" id="hdp_2_6_mapreduce_tarball_ld_library"> <type>mapred-site</type> - <set key="mapreduce.admin.user.env" value="LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64"/> + <set key="mapreduce.admin.user.env" value="LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64"/> </definition> </changes> </component>