You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/12/19 12:33:41 UTC
[7/7] ambari git commit: AMBARI-22671. Stack unit tests fixes
(aonishuk)
AMBARI-22671. Stack unit tests fixes (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc76993b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc76993b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc76993b
Branch: refs/heads/branch-3.0-perf
Commit: fc76993b1cb45d6652a1cbe11dba2e41bd024880
Parents: 1e5a47e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 19 14:33:27 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 19 14:33:27 2017 +0200
----------------------------------------------------------------------
.../libraries/script/script.py | 2 +-
.../common-services/configs/hive_default.json | 2 +-
.../configs/hive_unsupported_jdbc_type.json | 2 +-
.../common-services/configs/pxf_default.json | 165 +++++++++++++++--
.../configs/ranger_admin_default.json | 2 +-
.../ranger_admin_unsupported_db_flavor.json | 2 +-
.../common-services/configs/sqoop_default.json | 173 +++++++++++++++---
.../configs/sqoop_unsupported_jdbc_driver.json | 6 +-
.../configs/install_packages_config.json | 2 +-
.../install_packages_repository_file.json | 2 +-
.../configs/remove_previous_stacks.json | 2 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 2 +-
.../stacks/2.0.6/configs/altfs_plus_hdfs.json | 6 +-
.../stacks/2.0.6/configs/client-upgrade.json | 2 +-
.../2.0.6/configs/default.hbasedecom.json | 162 +++++++++++++++--
.../python/stacks/2.0.6/configs/default.json | 6 +-
.../2.0.6/configs/default.non_gmetad_host.json | 164 +++++++++++++++--
.../2.0.6/configs/default_ams_embedded.json | 164 +++++++++++++++--
.../stacks/2.0.6/configs/default_client.json | 163 +++++++++++++++--
.../2.0.6/configs/default_hive_nn_ha.json | 167 +++++++++++++++--
.../2.0.6/configs/default_hive_nn_ha_2.json | 167 +++++++++++++++--
.../2.0.6/configs/default_hive_non_hdfs.json | 165 +++++++++++++++--
.../2.0.6/configs/default_no_install.json | 6 +-
.../2.0.6/configs/default_oozie_mysql.json | 168 ++++++++++++++---
.../default_update_exclude_file_only.json | 6 +-
.../2.0.6/configs/default_with_bucket.json | 176 +++++++++++++++---
.../default_yarn_include_file_dont_manage.json | 181 ++++++++++++++++---
.../default_yarn_include_file_manage.json | 181 ++++++++++++++++---
.../stacks/2.0.6/configs/flume_target.json | 2 +-
.../2.0.6/configs/ha_bootstrap_active_node.json | 2 +-
.../configs/ha_bootstrap_standby_node.json | 2 +-
...ha_bootstrap_standby_node_initial_start.json | 2 +-
...dby_node_initial_start_dfs_nameservices.json | 2 +-
.../python/stacks/2.0.6/configs/ha_default.json | 2 +-
.../python/stacks/2.0.6/configs/ha_secured.json | 2 +-
.../python/stacks/2.0.6/configs/hbase-2.2.json | 165 ++++++++++++++---
.../stacks/2.0.6/configs/hbase-check-2.2.json | 162 +++++++++++++++--
.../stacks/2.0.6/configs/hbase-preupgrade.json | 166 +++++++++++++++--
.../2.0.6/configs/hbase-rs-2.2-phoenix.json | 167 ++++++++++++++---
.../stacks/2.0.6/configs/hbase-rs-2.2.json | 167 ++++++++++++++---
.../stacks/2.0.6/configs/hbase_no_phx.json | 170 ++++++++++++++---
.../stacks/2.0.6/configs/hbase_with_phx.json | 170 ++++++++++++++---
.../python/stacks/2.0.6/configs/nn_ru_lzo.json | 2 +-
.../2.0.6/configs/oozie_existing_sqla.json | 172 +++++++++++++++---
.../2.0.6/configs/rebalancehdfs_default.json | 2 +-
.../2.0.6/configs/rebalancehdfs_secured.json | 2 +-
.../stacks/2.0.6/configs/repository_file.json | 6 +-
.../python/stacks/2.0.6/configs/secured.json | 2 +-
.../stacks/2.0.6/configs/secured_client.json | 164 +++++++++++++++--
.../2.0.6/configs/secured_no_jce_name.json | 6 +-
.../secured_yarn_include_file_dont_manage.json | 175 +++++++++++++++---
.../secured_yarn_include_file_manage.json | 179 +++++++++++++++---
.../2.0.6/configs/zk-service_check_2.2.json | 158 ++++++++++++++--
.../stacks/2.1/configs/client-upgrade.json | 2 +-
.../2.1/configs/hive-metastore-upgrade.json | 6 +-
.../test/python/stacks/2.2/configs/default.json | 2 +-
.../2.2/configs/default_custom_path_config.json | 2 +-
.../stacks/2.2/configs/falcon-upgrade.json | 6 +-
.../python/stacks/2.2/configs/hive-upgrade.json | 175 +++++++++++++++---
.../journalnode-upgrade-hdfs-secure.json | 170 ++++++++++++++---
.../stacks/2.2/configs/journalnode-upgrade.json | 170 ++++++++++++++---
.../python/stacks/2.2/configs/knox_upgrade.json | 163 +++++++++++++++--
.../stacks/2.2/configs/oozie-downgrade.json | 169 ++++++++++++++---
.../stacks/2.2/configs/oozie-upgrade.json | 173 +++++++++++++++---
.../2.2/configs/pig-service-check-secure.json | 2 +-
.../2.2/configs/ranger-admin-default.json | 2 +-
.../2.2/configs/ranger-admin-secured.json | 2 +-
.../2.2/configs/ranger-admin-upgrade.json | 2 +-
.../2.2/configs/ranger-usersync-upgrade.json | 2 +-
.../test/python/stacks/2.2/configs/secured.json | 164 +++++++++++++++--
.../test/python/stacks/2.3/configs/ats_1_5.json | 173 +++++++++++++++---
.../stacks/2.3/configs/default.hbasedecom.json | 6 +-
.../test/python/stacks/2.3/configs/default.json | 2 +-
.../stacks/2.3/configs/hbase_default.json | 164 +++++++++++++++--
.../python/stacks/2.3/configs/hbase_secure.json | 163 +++++++++++++++--
.../test/python/stacks/2.3/configs/secure.json | 164 +++++++++++++++--
.../stacks/2.3/configs/spark_default.json | 162 +++++++++++++++--
.../stacks/2.3/configs/storm_default.json | 159 ++++++++++++++--
.../2.3/configs/storm_default_secure.json | 159 ++++++++++++++--
.../test/python/stacks/2.5/configs/default.json | 2 +-
.../python/stacks/2.5/configs/hsi_default.json | 176 +++++++++++++++---
.../2.5/configs/hsi_default_for_restart.json | 177 +++++++++++++++---
.../test/python/stacks/2.5/configs/hsi_ha.json | 176 +++++++++++++++---
.../stacks/2.5/configs/ranger-kms-default.json | 180 ++++++++++++++----
.../stacks/2.5/configs/ranger-kms-secured.json | 181 +++++++++++++++----
.../test/python/stacks/2.5/configs/secured.json | 164 +++++++++++++++--
.../test/python/stacks/2.6/DRUID/test_druid.py | 2 +-
.../test/python/stacks/2.6/configs/default.json | 168 +++++++++++++++--
.../2.6/configs/default_kafka_plaintext.json | 168 +++++++++++++++--
.../configs/default_kafka_plaintextsasl.json | 168 +++++++++++++++--
.../configs/default_kafka_sasl_plaintext.json | 168 +++++++++++++++--
.../2.6/configs/default_kafka_sasl_ssl.json | 168 +++++++++++++++--
92 files changed, 7462 insertions(+), 1095 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 21aeec7..65c4920 100644
--- a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -1050,7 +1050,7 @@ class Script(object):
def generate_configs_get_xml_file_content(self, filename, dict):
config = self.get_config()
return {'configurations':config['configurations'][dict],
- 'configurationAttributes':config['configurationAttributes'][dict]}
+ 'configuration_attributes':config['configurationAttributes'][dict]}
def generate_configs_get_xml_file_dict(self, filename, dict):
config = self.get_config()
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/hive_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/hive_default.json b/ambari-server/src/test/python/common-services/configs/hive_default.json
index 45af847..cbdc8a7 100644
--- a/ambari-server/src/test/python/common-services/configs/hive_default.json
+++ b/ambari-server/src/test/python/common-services/configs/hive_default.json
@@ -758,7 +758,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json b/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
index 76759c1..dc2a092 100644
--- a/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
+++ b/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
@@ -748,7 +748,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/pxf_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/pxf_default.json b/ambari-server/src/test/python/common-services/configs/pxf_default.json
index 384ca40..512d589 100644
--- a/ambari-server/src/test/python/common-services/configs/pxf_default.json
+++ b/ambari-server/src/test/python/common-services/configs/pxf_default.json
@@ -2,22 +2,154 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.3",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agent_stack_retry_count": "5",
- "agent_stack_retry_on_unavailability": "false",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
- "ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.3",
- "stack_name": "HDP",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
- "ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "db_name": "ambari",
- "package_list": "[{\"name\":\"pxf-service\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"apache-tomcat\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hive\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hdfs\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hbase\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-json\",\"skipUpgrade\":false, \"condition\": \"\"}]"
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
@@ -29,7 +161,8 @@
"service_package_folder": "PXF",
"script_type": "PYTHON",
"script": "scripts/service_check.py",
- "excluded_hosts": "host1,host2"
+ "excluded_hosts": "host1,host2",
+ "package_list": "[{\"name\":\"pxf-service\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"apache-tomcat\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hive\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hdfs\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hbase\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-json\",\"skipUpgrade\":false, \"condition\": \"\"}]"
},
"taskId": 152,
"public_hostname": "c6401.ambari.apache.org",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json b/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
index 4702d65..f2aab13 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
@@ -543,7 +543,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json b/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
index d7abe6b..d79f73d 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
@@ -359,7 +359,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/sqoop_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/sqoop_default.json b/ambari-server/src/test/python/common-services/configs/sqoop_default.json
index 0c74006..7b3eafc 100644
--- a/ambari-server/src/test/python/common-services/configs/sqoop_default.json
+++ b/ambari-server/src/test/python/common-services/configs/sqoop_default.json
@@ -2,24 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
- "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agent_stack_retry_count": "5",
- "agent_stack_retry_on_unavailability": "false",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
- "ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
- "stack_name": "HDP",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
- "ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari"
- },
+ "clusterLevelParams": {
+ "stack_version": "2.0",
+ "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "HIVE",
@@ -813,7 +944,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -825,7 +956,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -844,7 +975,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json b/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
index b571b9a..5d79e31 100644
--- a/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
+++ b/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
@@ -813,7 +813,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -825,7 +825,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -844,7 +844,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
index 62ce5f1..36a7896 100644
--- a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
+++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
@@ -81,7 +81,7 @@
"all_ping_ports": [
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"0b3.vm"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
index 84bc64d..bdf062c 100644
--- a/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
+++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
@@ -79,7 +79,7 @@
"all_ping_ports": [
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"0b3.vm"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json b/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
index ec28e05..1bdbf7c 100644
--- a/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
+++ b/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
@@ -56,7 +56,7 @@
"all_ping_ports": [
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"0b3.vm"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index e153225..ec1bc5c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -84,7 +84,7 @@ class TestHBaseMaster(RMFTestCase):
# the json file is not a "well formed" install command
json_content['roleCommand'] = 'INSTALL'
json_content['commandParams']['version'] = version
- json_content['hostLevelParams']['package_list'] = "[{\"name\":\"hbase_${stack_version}\",\"condition\":\"\",\"skipUpgrade\":false}]"
+ json_content['commandParams']['package_list'] = "[{\"name\":\"hbase_${stack_version}\",\"condition\":\"\",\"skipUpgrade\":false}]"
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_master.py",
classname = "HbaseMaster",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
index f1d1944..2cf3190 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
@@ -920,7 +920,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -932,7 +932,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -951,7 +951,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
index a112b64..b631040 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
@@ -831,7 +831,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index 2ec7f51..9888784 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -2,23 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.0",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agent_stack_retry_count": "5",
- "agent_stack_retry_on_unavailability": "false",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
"jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
- "ambari_db_rca_password": "mapred",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
- "stack_name": "HDP",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari"
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "OOZIE",
@@ -689,7 +821,7 @@
"ganglia_server_host": [
"c6402.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -701,7 +833,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -720,7 +852,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index d5c676e..2de68fa 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -28,7 +28,11 @@
"hooks_folder": "stack-hooks",
"version": "2.1.0.0-1234",
"command_timeout": "300",
- "script_type": "PYTHON"
+ "script_type": "PYTHON",
+ "xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
+ "env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
+ "properties_configs_list":[{"runtime.properties":"falcon-runtime.properties"},{"startup.properties":"falcon-startup.properties"}],
+ "output_file":"HDFS_CLIENT-configs.tar.gz"
},
"clusterLevelParams": {
"stack_version": "2.1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index b65d3c0..4a67940 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
@@ -2,21 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.0",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
- "ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
+ "hooks_folder": "stack-hooks",
"stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari"
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "OOZIE",
@@ -697,10 +831,10 @@
"slave_hosts": [
"c6402.ambari.apache.org"
],
- "ganglia_server_host": [
+ "ganglia_server_hosts": [
"c6402.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -712,7 +846,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -731,7 +865,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index dabedf7..9098bc1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -2,25 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.1",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
"jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
"ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
- "stack_name": "HDP",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari",
- "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
- "user_list": "[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "HIVE",
@@ -1049,7 +1179,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -1061,7 +1191,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -1080,7 +1210,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
index b6a97b9..c3e54b1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
@@ -2,24 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.0",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agent_stack_retry_count": "5",
- "agent_stack_retry_on_unavailability": "false",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
"jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
"ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
- "stack_name": "HDP",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari"
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "HIVE",
@@ -812,7 +943,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -824,7 +955,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -843,7 +974,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc76993b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
index 9bac43f..90305d7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
@@ -2,28 +2,155 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.0",
"not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "agent_stack_retry_count": "5",
- "agent_stack_retry_on_unavailability": "false",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"], \"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"], \"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"], \"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"], \"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"], \"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"], \"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
"jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
"ambari_db_rca_password": "mapred",
- "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.0",
- "stack_name": "HDP",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url": "http://c6401.ambari.apache.org/resources//ojdbc6.jar",
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari",
- "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
- "user_list": "[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]",
- "host_sys_prepped": "true",
- "package_list": "[{\"name\":\"mysql-server\"}]"
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url": "http://c6401.ambari.apache.org/resources//mysql-connector-java.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60",
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl": "http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6",
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
"serviceName": "HIVE",
@@ -658,7 +785,7 @@
"ganglia_server_host": [
"c6401.ambari.apache.org"
],
- "hive_server_host": [
+ "hive_server_hosts": [
"c6402.ambari.apache.org"
],
"logviewer_server_hosts": [
@@ -670,7 +797,7 @@
"hbase_rs_hosts": [
"c6402.ambari.apache.org"
],
- "webhcat_server_host": [
+ "webhcat_server_hosts": [
"c6402.ambari.apache.org"
],
"zookeeper_server_hosts": [
@@ -689,7 +816,7 @@
"8670",
"8670"
],
- "rm_host": [
+ "resourcemanager_hosts": [
"c6402.ambari.apache.org"
],
"all_hosts": [