AMBARI-13666: Align to HAWQ Resource manager GUC names HAWQ-111 (bhuvnesh2703 via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3bfd4cb4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3bfd4cb4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3bfd4cb4 Branch: refs/heads/branch-dev-patch-upgrade Commit: 3bfd4cb491c50a7735e05e77c25fbe66e7d36e2d Parents: cc5b610 Author: Jun Aoki <[email protected]> Authored: Mon Nov 2 16:51:12 2015 -0800 Committer: Jun Aoki <[email protected]> Committed: Mon Nov 2 16:51:12 2015 -0800 ---------------------------------------------------------------------- .../HAWQ/2.0.0.0/configuration/hawq-site.xml | 28 ++++----- .../HAWQ/2.0.0.0/package/scripts/common.py | 4 +- .../stacks/2.3/common/services-hawq-1-host.json | 61 ++++++++------------ .../2.3/common/services-hawq-3-hosts.json | 61 ++++++++------------ .../services-master_ambari_colo-3-hosts.json | 61 ++++++++------------ .../services-master_standby_colo-3-hosts.json | 61 ++++++++------------ .../common/services-normal-hawq-3-hosts.json | 61 ++++++++------------ .../services-standby_ambari_colo-3-hosts.json | 61 ++++++++------------ .../app/utils/configs/config_property_helper.js | 4 +- 9 files changed, 166 insertions(+), 236 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml index 3e9573e..41b10dc 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/configuration/hawq-site.xml @@ -91,7 +91,7 @@ </property> <property> - <name>hawq_resourcemanager_segment_limit_memory_use</name> + <name>hawq_rm_memory_limit_perseg</name> <value>64GB</value> <description>The limit of memory usage in a HAWQ segment when hawq_global_rm_type is set 'none'. @@ -99,7 +99,7 @@ </property> <property> - <name>hawq_resourcemanager_segment_limit_core_use</name> + <name>hawq_rm_nvcore_limit_perseg</name> <value>16</value> <description>The limit of virtual core usage in a HAWQ segment when hawq_global_rm_type is set 'none'. @@ -107,60 +107,56 @@ </property> <property> - <name>hawq_resourcemanager_yarn_resourcemanager_address</name> + <name>hawq_rm_yarn_address</name> <value>localhost:8032</value> <description>The address of YARN resource manager server.</description> </property> <property> - <name>hawq_resourcemanager_yarn_resourcemanager_scheduler_address</name> + <name>hawq_rm_yarn_scheduler_address</name> <value>localhost:8030</value> <description>The address of YARN scheduler server.</description> </property> <property> - <name>hawq_resourcemanager_yarn_queue</name> + <name>hawq_rm_yarn_queue_name</name> <value>default</value> <description>The YARN queue name to register HAWQ resource manager.</description> </property> <property> - <name>hawq_resourcemanager_yarn_application_name</name> + <name>hawq_rm_yarn_app_name</name> <value>hawq</value> <description>The application name to register HAWQ resource manager in YARN.</description> </property> - <property> - <name>hawq_resourcemanager_log_level</name> - <value>10</value> - </property> <property> - <name>hawq_resourceenforcer_cpu_enable</name> + <name>hawq_re_cpu_enable</name> <value>false</value> </property> <property> - <name>hawq_resourceenforcer_cgroup_mount_point</name> + <name>hawq_re_cgroup_mount_point</name> <value>/sys/fs/cgroup</value> </property> <property> - <name>hawq_resourceenforcer_cgroup_hierarchy_name</name> + <name>hawq_re_cgroup_hierarchy_name</name> <value>hadoop-yarn</value> </property> <property> - <name>hawq_resourceenforcer_cleanup_period</name> + <name>hawq_re_cleanup_period</name> <value>180</value> </property> <property> - <name>hawq_resourceenforcer_cpu_weight</name> + <name>hawq_re_cpu_weight</name> <value>1024.0</value> </property> <property> - <name>hawq_resourceenforcer_vcore_pcore_ratio</name> + <name>hawq_re_vcore_pcore_ratio</name> <value>1.0</value> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py index 8e363c1..31ef2fa 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0.0/package/scripts/common.py @@ -107,8 +107,8 @@ def __substitute_hostnames_in_hawq_site(): substituted_hawq_site = params.hawq_site.copy() hawq_site_property_map = {"hawq_master_address_host": params.hawqmaster_host, "hawq_standby_address_host": hawqstandby_host_desired_value, - "hawq_resourcemanager_yarn_resourcemanager_address": params.rm_host, - "hawq_resourcemanager_yarn_resourcemanager_scheduler_address": params.rm_host, + "hawq_rm_yarn_address": params.rm_host, + "hawq_rm_yarn_scheduler_address": params.rm_host, "hawq_dfs_url": params.namenode_host } http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-hawq-1-host.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-1-host.json b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-1-host.json index 36852c4..53b3e08 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-1-host.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-1-host.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cleanup_period", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cleanup_period", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-hawq-3-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-3-hosts.json b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-3-hosts.json index 36852c4..53b3e08 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-3-hosts.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-3-hosts.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cleanup_period", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cleanup_period", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-master_ambari_colo-3-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-master_ambari_colo-3-hosts.json b/ambari-server/src/test/python/stacks/2.3/common/services-master_ambari_colo-3-hosts.json index 78ba3aa..876f577 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-master_ambari_colo-3-hosts.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-master_ambari_colo-3-hosts.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cleanup_period", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cleanup_period", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-master_standby_colo-3-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-master_standby_colo-3-hosts.json b/ambari-server/src/test/python/stacks/2.3/common/services-master_standby_colo-3-hosts.json index e380492..f600e9b 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-master_standby_colo-3-hosts.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-master_standby_colo-3-hosts.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cleanup_period", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cleanup_period", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json index 2e76c3e..9fab56d 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cleanup_period", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cleanup_period", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-server/src/test/python/stacks/2.3/common/services-standby_ambari_colo-3-hosts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-standby_ambari_colo-3-hosts.json b/ambari-server/src/test/python/stacks/2.3/common/services-standby_ambari_colo-3-hosts.json index 08d1c36..ca0637c 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-standby_ambari_colo-3-hosts.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-standby_ambari_colo-3-hosts.json @@ -172,10 +172,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_hierarchy_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_hierarchy_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_hierarchy_name", + "property_name" : "hawq_re_cgroup_hierarchy_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -183,10 +183,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cgroup_mount_point", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cgroup_mount_point", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cgroup_mount_point", + "property_name" : "hawq_re_cgroup_mount_point", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -194,10 +194,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cleanup_period", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cleanup_period", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -205,10 +205,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_enable", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_enable", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_enable", + "property_name" : "hawq_re_cpu_enable", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -216,10 +216,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_cpu_weight", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_cpu_weight", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_cpu_weight", + "property_name" : "hawq_re_cpu_weight", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -227,10 +227,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourceenforcer_vcore_pcore_ratio", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_re_vcore_pcore_ratio", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourceenforcer_vcore_pcore_ratio", + "property_name" : "hawq_re_vcore_pcore_ratio", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -238,10 +238,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_log_level", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_nvcore_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_log_level", + "property_name" : "hawq_rm_nvcore_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -249,21 +249,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_core_use", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_memory_limit_perseg", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_core_use", - "service_name" : "HAWQ", - "stack_name" : "HDP", - "stack_version" : "2.3", - "type" : "hawq-site.xml" - }, - "dependencies" : [ ] - }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_segment_limit_memory_use", - "StackConfigurations" : { - "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_segment_limit_memory_use", + "property_name" : "hawq_rm_memory_limit_perseg", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -282,10 +271,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_application_name", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_app_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_application_name", + "property_name" : "hawq_rm_yarn_app_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -293,10 +282,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_queue", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_queue_name", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_queue", + "property_name" : "hawq_rm_yarn_queue_name", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -304,10 +293,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_address", + "property_name" : "hawq_rm_yarn_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -315,10 +304,10 @@ }, "dependencies" : [ ] }, { - "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "href" : "/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/hawq_rm_yarn_scheduler_address", "StackConfigurations" : { "property_depends_on" : [ ], - "property_name" : "hawq_resourcemanager_yarn_resourcemanager_scheduler_address", + "property_name" : "hawq_rm_yarn_scheduler_address", "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", @@ -2572,4 +2561,4 @@ "jdk1.7.dest-file" : "jdk-7u67-linux-x64.tar.gz", "server.jdbc.postgres.schema" : "ambari" } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3bfd4cb4/ambari-web/app/utils/configs/config_property_helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js index 23759bb..80f98f5 100644 --- a/ambari-web/app/utils/configs/config_property_helper.js +++ b/ambari-web/app/utils/configs/config_property_helper.js @@ -228,13 +228,13 @@ module.exports = { var nnHost = masterComponentHostsInDB.findProperty('component', 'NAMENODE').hostName; this.setRecommendedValue(configProperty, hostWithPort, nnHost); break; - case 'hawq_resourcemanager_yarn_resourcemanager_address': + case 'hawq_rm_yarn_address': var rmHost = masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER'); if (rmHost) { this.setRecommendedValue(configProperty, hostWithPort, rmHost.hostName); } break; - case 'hawq_resourcemanager_yarn_resourcemanager_scheduler_address': + case 'hawq_rm_yarn_scheduler_address': var rmHost = masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER'); if (rmHost) { this.setRecommendedValue(configProperty, hostWithPort, rmHost.hostName);
