Repository: ambari Updated Branches: refs/heads/trunk 871667c36 -> 14bb30125
AMBARI-11222. Remove hive_dbroot (unused property) from the HDP stack definitions. (rnettleton) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14bb3012 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14bb3012 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14bb3012 Branch: refs/heads/trunk Commit: 14bb3012597d6463ec375c6a86b7039b43ee4278 Parents: 871667c Author: Bob Nettleton <[email protected]> Authored: Mon May 18 17:50:40 2015 -0400 Committer: Bob Nettleton <[email protected]> Committed: Mon May 18 17:51:18 2015 -0400 ---------------------------------------------------------------------- .../common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml | 5 ----- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 1 - .../main/resources/custom_actions/scripts/validate_configs.py | 6 +++--- .../stacks/HDP/1.3.0/services/HIVE/configuration/global.xml | 5 ----- .../stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py | 1 - 5 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml index 92373ad..923a9ba 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml @@ -50,11 +50,6 @@ <description>Database name.</description> </property> <property> - <name>hive_dbroot</name> - <value>/usr/lib/hive/lib/</value> - <description>Hive DB Directory.</description> - </property> - <property> <name>hive_log_dir</name> <value>/var/log/hive</value> <description>Directory for Hive Log files.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/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 fb90b57..7254f3c 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 @@ -211,7 +211,6 @@ hive_metastore_keytab_path = config['configurations']['hive-site']['hive.metast hive_server2_keytab = config['configurations']['hive-site']['hive.server2.authentication.kerberos.keytab'] #hive_env -hive_dbroot = config['configurations']['hive-env']['hive_dbroot'] hive_log_dir = config['configurations']['hive-env']['hive_log_dir'] hive_pid_dir = status_params.hive_pid_dir hive_pid = status_params.hive_pid http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py b/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py index 4529539..4ef0f00 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py @@ -120,13 +120,13 @@ PROPERTIES_TO_CHECK = { }, #HIVE "HIVE_METASTORE": { - "hive-env": ["hive_dbroot", "hive_log_dir", "hive_pid_dir"] + "hive-env": ["hive_log_dir", "hive_pid_dir"] }, "HIVE_SERVER": { - "hive-env": ["hive_dbroot", "hive_log_dir", "hive_pid_dir"] + "hive-env": ["hive_log_dir", "hive_pid_dir"] }, "MYSQL_SERVER": { - "hive-env": ["hive_dbroot", "hive_log_dir", "hive_pid_dir"] + "hive-env": ["hive_log_dir", "hive_pid_dir"] }, "HIVE_CLIENT": { "hive-env": ["hive_log_dir", "hive_pid_dir"] http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml index d9adc80..e5fd427 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml @@ -87,11 +87,6 @@ <description>Hive Library.</description> </property> <property> - <name>hive_dbroot</name> - <value>/usr/lib/hive/lib/</value> - <description>Hive DB Directory.</description> - </property> - <property> <name>hive_conf_dir</name> <value>/etc/hive/conf</value> <description>Hive Conf Dir.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py index 0d924e9..8cb4bd2 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py @@ -62,7 +62,6 @@ hive_metastore_keytab_path = config['configurations']['hive-site']['hive.metast #hive_env hive_conf_dir = "/etc/hive/conf" -hive_dbroot = config['configurations']['global']['hive_dbroot'] hive_log_dir = config['configurations']['global']['hive_log_dir'] hive_pid_dir = status_params.hive_pid_dir hive_pid = status_params.hive_pid
