Repository: ambari Updated Branches: refs/heads/branch-2.4 b59662a17 -> 5d2c1ff04
AMBARI-17700. Slider range for should be dynamic on HAWQ settings page. (Lav Jain via adenissov) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d2c1ff0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d2c1ff0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d2c1ff0 Branch: refs/heads/branch-2.4 Commit: 5d2c1ff048a0a0703fe69fa264b603473904232a Parents: b59662a Author: Alexander Denissov <[email protected]> Authored: Mon Jul 18 12:28:48 2016 -0700 Committer: Alexander Denissov <[email protected]> Committed: Mon Jul 18 12:28:48 2016 -0700 ---------------------------------------------------------------------- .../HAWQ/2.0.0/configuration/hawq-site.xml | 6 ++---- .../HAWQ/2.0.0/service_advisor.py | 5 +++-- .../common-services/HAWQ/2.0.0/themes/theme.json | 19 ++----------------- 3 files changed, 7 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5d2c1ff0/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml index 150b2c6..0bddb07 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml @@ -308,13 +308,13 @@ The default number of buckets when creating a hash distributed table, if not defined explicitly when creating the table. When running a query on a hash dist table, the query resource is fixed and equal to the number of buckets. The default set during installation is the number of HAWQ Segments multiplied by 6. - Adjust the value when the number of HAWQ Segments changes in the cluster. + Adjust the value when the number of HAWQ Segments changes in the cluster. If parameter value is changed, existing Hash distributed tables must be redistributed. </description> <value-attributes> <type>int</type> <minimum>1</minimum> <maximum>10000</maximum> - <increment-step>100</increment-step> + <increment-step>1</increment-step> </value-attributes> <on-ambari-upgrade add="true"/> </property> @@ -337,7 +337,6 @@ </property> <property> <name>hawq_rm_nvseg_perquery_limit</name> - <display-name>Virtual Segments Limit per Query (Total)</display-name> <value>512</value> <description> The maximum number of virtual segments per query across the cluster. @@ -348,7 +347,6 @@ <type>int</type> <minimum>1</minimum> <maximum>10000</maximum> - <increment-step>100</increment-step> </value-attributes> <on-ambari-upgrade add="true"/> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/5d2c1ff0/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/service_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/service_advisor.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/service_advisor.py index 16e2952..feb3d52 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/service_advisor.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/service_advisor.py @@ -16,12 +16,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -import os import imp +import math +import os import re import socket import traceback -import math SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/') @@ -171,6 +171,7 @@ class HAWQ200ServiceAdvisor(service_advisor.ServiceAdvisor): else: buckets = factor * numSegments putHawqSiteProperty('default_hash_table_bucket_number', buckets) + putHawqSitePropertyAttribute('default_hash_table_bucket_number', "maximum", numSegments * 16 if 10000 > numSegments * 16 else 10000) # update YARN RM urls with the values from yarn-site if YARN is installed if "YARN" in servicesList and "yarn-site" in services["configurations"]: http://git-wip-us.apache.org/repos/asf/ambari/blob/5d2c1ff0/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json index 3c8a897..7e8e6d3 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json @@ -119,15 +119,11 @@ "subsection-name":"general-col2" }, { - "config":"hawq-site/default_hash_table_bucket_number", - "subsection-name":"resource-management-col2" - }, - { "config":"hawq-site/hawq_rm_nvseg_perquery_perseg_limit", "subsection-name":"resource-management-col2" }, { - "config":"hawq-site/hawq_rm_nvseg_perquery_limit", + "config":"hawq-site/default_hash_table_bucket_number", "subsection-name":"resource-management-col2" }, { @@ -194,17 +190,6 @@ } }, { - "config":"hawq-site/default_hash_table_bucket_number", - "widget":{ - "type":"slider", - "units": [ - { - "unit-name":"int" - } - ] - } - }, - { "config":"hawq-site/hawq_rm_nvseg_perquery_perseg_limit", "widget":{ "type":"slider", @@ -216,7 +201,7 @@ } }, { - "config":"hawq-site/hawq_rm_nvseg_perquery_limit", + "config":"hawq-site/default_hash_table_bucket_number", "widget":{ "type":"slider", "units": [
