You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/09/14 14:38:51 UTC
[15/38] ambari git commit: AMBARI-21947. Ambari updates
database/tables location from intended remote HDFS to local HDFS (aonishuk)
AMBARI-21947. Ambari updates database/tables location from intended remote HDFS to local HDFS (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18ae06d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18ae06d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18ae06d3
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 18ae06d3e49c98f919b666deca7c42b460ee204f
Parents: fa0ecc4
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Sep 13 14:27:24 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Sep 13 14:27:24 2017 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive_service.py | 4 ++++
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 3 +++
.../resources/stacks/HDP/2.0.6/configuration/cluster-env.xml | 6 ++++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/18ae06d3/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
index 1f2b644..2412bf9 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_service.py
@@ -168,6 +168,10 @@ def validate_connection(target_path_to_jdbc, hive_lib_path):
def check_fs_root(conf_dir, execution_path):
import params
+ if not params.manage_hive_fsroot:
+ Logger.info("Skipping fs root check as cluster-env/manage_hive_fsroot is disabled")
+ return
+
if not params.fs_root.startswith("hdfs://"):
Logger.info("Skipping fs root check as fs_root does not start with hdfs://")
return
http://git-wip-us.apache.org/repos/asf/ambari/blob/18ae06d3/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 9ba1f99..ceeac79 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
@@ -867,3 +867,6 @@ druid_storage_dir = ""
if 'druid-common' in config['configurations'] \
and 'druid.storage.storageDirectory' in config['configurations']['druid-common']:
druid_storage_dir = config['configurations']['druid-common']['druid.storage.storageDirectory']
+
+
+manage_hive_fsroot = default('/configurations/cluster-env/manage_hive_fsroot', True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/18ae06d3/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 45f3b42..55b9cd3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -357,4 +357,10 @@ gpgcheck=0</value>
<description>Timeout for safemode exit, during namenode rolling restart</description>
<on-ambari-upgrade add="true"/>
</property>
+ <property>
+ <name>manage_hive_fsroot</name>
+ <value>true</value>
+ <description>If flag is set to true, ambari will manage fsroot for Hive, by setting it to fs.defautlFS of local HDFS</description>
+ <on-ambari-upgrade add="false"/>
+ </property>
</configuration>