You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/10/28 23:11:14 UTC
ambari git commit: AMBARI-13589: Rename resource manager's GUC names
in sync with apache hawq (bhuvnesh2703 via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk 2337e5390 -> 897703b72
AMBARI-13589: Rename resource manager's GUC names in sync with apache hawq (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/897703b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/897703b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/897703b7
Branch: refs/heads/trunk
Commit: 897703b72f9a5274f01d277f894d30b3af87faac
Parents: 2337e53
Author: Jun Aoki <ja...@apache.org>
Authored: Wed Oct 28 15:10:46 2015 -0700
Committer: Jun Aoki <ja...@apache.org>
Committed: Wed Oct 28 15:10:46 2015 -0700
----------------------------------------------------------------------
.../HAWQ/2.0.0.0/configuration/hawq-site.xml | 21 +++++++++++++++++---
.../HAWQ/2.0.0.0/package/scripts/common.py | 6 +++---
2 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/897703b7/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 a322a5b..3e9573e 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
@@ -81,7 +81,7 @@
<!-- HAWQ resource manager parameters -->
<property>
- <name>hawq_resourcemanager_server_type</name>
+ <name>hawq_global_rm_type</name>
<value>none</value>
<description>The resource manager type to start for allocating resource.
'none' means HAWQ resource manager exclusively uses whole
@@ -94,7 +94,7 @@
<name>hawq_resourcemanager_segment_limit_memory_use</name>
<value>64GB</value>
<description>The limit of memory usage in a HAWQ segment when
- HAWQ is set 'none'.
+ hawq_global_rm_type is set 'none'.
</description>
</property>
@@ -102,7 +102,7 @@
<name>hawq_resourcemanager_segment_limit_core_use</name>
<value>16</value>
<description>The limit of virtual core usage in a HAWQ segment when
- HAWQ is set 'none'.
+ hawq_global_rm_type is set 'none'.
</description>
</property>
@@ -164,4 +164,19 @@
<value>1.0</value>
</property>
+ <property>
+ <name>hawq_resourcemanager_master_address_domainsocket_port</name>
+ <value>5436</value>
+ </property>
+
+ <property>
+ <name>hawq_rm_master_port</name>
+ <value>5437</value>
+ </property>
+
+ <property>
+ <name>hawq_rm_segment_port</name>
+ <value>5438</value>
+ </property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/897703b7/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 41a3196..8e363c1 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
@@ -276,8 +276,8 @@ def validate_configuration():
raise Fail("Configurations does not contain hawq-site. Please include HAWQ")
# If HAWQ is set to use YARN and YARN is not configured, error.
- rm_type = params.config["configurations"]["hawq-site"].get("hawq_resourcemanager_server_type")
+ rm_type = params.config["configurations"]["hawq-site"].get("hawq_global_rm_type")
if rm_type == "yarn" and "yarn-site" not in params.config["configurations"]:
raise Fail("HAWQ is set to use YARN but YARN is not deployed. " +
- "hawq_resourcemanager_server_type property in hawq-site is set to 'yarn' but YARN is not configured. " +
- "Please deploy YARN before starting HAWQ or change the value of hawq_resourcemanager_server_type property to 'none'")
+ "hawq_global_rm_type property in hawq-site is set to 'yarn' but YARN is not configured. " +
+ "Please deploy YARN before starting HAWQ or change the value of hawq_global_rm_type property to 'none'")