ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-21876. Remove hive.custom-extensions.root from Hive Properties.(vbrodetskyi)
Date Wed, 06 Sep 2017 10:55:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 4a8b85df3 -> 48ad866e3


AMBARI-21876. Remove hive.custom-extensions.root from Hive Properties.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48ad866e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48ad866e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48ad866e

Branch: refs/heads/branch-2.6
Commit: 48ad866e37016b60001226a4712b4b3b7fa5ca18
Parents: 4a8b85d
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Sep 6 13:06:17 2017 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Sep 6 13:06:17 2017 +0300

----------------------------------------------------------------------
 .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml     | 5 -----
 .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml         | 4 +---
 .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml       | 5 -----
 .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml           | 4 +---
 .../2.0.6/hooks/before-START/scripts/custom_extensions.py    | 3 +--
 .../stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml | 8 --------
 6 files changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
index 4b53c7c..3c6f533 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
@@ -282,11 +282,6 @@
             <set key="custom.hive.warehouse.mode" value="0770" if-type="hive-site" if-key="custom.hive.warehouse.mode"
if-key-state="absent"/>
           </definition>
 
-          <definition xsi:type="configure" id="biginsights_4_2_hive_site_custom_extensions"
summary="Enable custom extensions in hive-site">
-            <type>hive-site</type>
-            <set key="hive.custom-extensions.root" value="/hdp/ext/{{major_stack_version}}/hive"
if-key-state="absent" if-type="hive-site" if-key="hive.custom-extensions.root"/>
-          </definition>
-
           <definition xsi:type="configure" id="biginsights_4_2_hive_env_custom_extensions"
summary="Enable custom extensions in hive-env">
             <type>hive-env</type>
             <replace key="content" find="if [ &quot;${HIVE_AUX_JARS_PATH}&quot;
!= &quot;&quot; ]; then" replace-with="export HIVE_AUX_JARS_PATH={{stack_root}}/current/ext/hive&#10;if
[ &quot;${HIVE_AUX_JARS_PATH}&quot; != &quot;&quot; ]; then"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
index 48d1d92..ecf57f0 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
@@ -344,9 +344,7 @@
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes
for Hive Server">
         <task xsi:type="configure" id="biginsights_4_2_hive_server_configure_authentication"/>
       </execute-stage>
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Enable custom extensions
for Hive Server">
-        <task xsi:type="configure" id="biginsights_4_2_hive_site_custom_extensions"/>
-      </execute-stage>
+
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Enable custom extensions
for Hive Server">
         <task xsi:type="configure" id="biginsights_4_2_hive_env_custom_extensions"/>
       </execute-stage>

http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index 29fcac0..c9f6f53 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -300,11 +300,6 @@
             <set key="custom.hive.warehouse.mode" value="0770" if-type="hive-site" if-key="custom.hive.warehouse.mode"
if-key-state="absent"/>
           </definition>
 
-          <definition xsi:type="configure" id="biginsights_4_2_hive_site_custom_extensions"
summary="Enable custom extensions in hive-site">
-            <type>hive-site</type>
-            <set key="hive.custom-extensions.root" value="/hdp/ext/{{major_stack_version}}/hive"
if-key-state="absent" if-type="hive-site" if-key="hive.custom-extensions.root"/>
-          </definition>
-
           <definition xsi:type="configure" id="biginsights_4_2_hive_env_custom_extensions"
summary="Enable custom extensions in hive-env">
             <type>hive-env</type>
             <replace key="content" find="if [ &quot;${HIVE_AUX_JARS_PATH}&quot;
!= &quot;&quot; ]; then" replace-with="export HIVE_AUX_JARS_PATH={{stack_root}}/current/ext/hive&#10;if
[ &quot;${HIVE_AUX_JARS_PATH}&quot; != &quot;&quot; ]; then"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
index 1d4a6f4..a169eac 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
@@ -291,9 +291,7 @@
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes
for Hive Server">
         <task xsi:type="configure" id="biginsights_4_2_hive_server_configure_authentication"/>
       </execute-stage>
-      <execute-stage service="HIVE" component="HIVE_SERVER" title="Enable custom extensions
for Hive Server">
-        <task xsi:type="configure" id="biginsights_4_2_hive_site_custom_extensions"/>
-      </execute-stage>
+
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Enable custom extensions
for Hive Server">
         <task xsi:type="configure" id="biginsights_4_2_hive_env_custom_extensions"/>
       </execute-stage>

http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/custom_extensions.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/custom_extensions.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/custom_extensions.py
index 63f6f70..04299ba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/custom_extensions.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/custom_extensions.py
@@ -92,8 +92,7 @@ def setup_extensions_hive():
 
   hive_custom_extensions_enabled = default("/configurations/hive-site/hive.custom-extensions.enabled",
False)
   hive_custom_extensions_owner = default("/configurations/hive-site/hive.custom-extensions.owner",
params.hdfs_user)
-  hive_custom_extensions_hdfs_dir = get_config_formatted_value(default("/configurations/hive-site/hive.custom-extensions.root",
-                                               DEFAULT_HADOOP_HIVE_EXTENSION_DIR.format(params.major_stack_version)))
+  hive_custom_extensions_hdfs_dir = DEFAULT_HADOOP_HIVE_EXTENSION_DIR.format(params.major_stack_version)
 
   hive_custom_extensions_local_dir = "{0}/current/ext/hive".format(Script.get_stack_root())
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/48ad866e/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml
index c0800ed..485f829 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-site.xml
@@ -33,12 +33,4 @@ limitations under the License.
     <on-ambari-upgrade add="false"/>
   </property>
 
-  <property>
-    <name>hive.custom-extensions.root</name>
-    <value>/hdp/ext/{{major_stack_version}}/hive</value>
-    <description>
-        Root directory for hive extensions in HDFS
-    </description>
-    <on-ambari-upgrade add="false"/>
-  </property>
 </configuration>


Mime
View raw message