Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4894F200B48 for ; Mon, 18 Jul 2016 21:27:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 47124160A65; Mon, 18 Jul 2016 19:27:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6771B160A5D for ; Mon, 18 Jul 2016 21:27:11 +0200 (CEST) Received: (qmail 54465 invoked by uid 500); 18 Jul 2016 19:27:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 54456 invoked by uid 99); 18 Jul 2016 19:27:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2016 19:27:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49E73DFAF5; Mon, 18 Jul 2016 19:27:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: adenissov@apache.org To: commits@ambari.apache.org Message-Id: <901686fbea454cd5beec954a045f7f18@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17700. Slider range for should be dynamic on HAWQ settings page. (Lav Jain via adenissov) Date: Mon, 18 Jul 2016 19:27:10 +0000 (UTC) archived-at: Mon, 18 Jul 2016 19:27:12 -0000 Repository: ambari Updated Branches: refs/heads/trunk e47efc67d -> 4f26b575c 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/4f26b575 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f26b575 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f26b575 Branch: refs/heads/trunk Commit: 4f26b575c6c31169b254e355bc801bd7781bbb69 Parents: e47efc6 Author: Alexander Denissov Authored: Mon Jul 18 12:26:30 2016 -0700 Committer: Alexander Denissov Committed: Mon Jul 18 12:26:30 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/4f26b575/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. int 1 10000 - 100 + 1 @@ -337,7 +337,6 @@ hawq_rm_nvseg_perquery_limit - Virtual Segments Limit per Query (Total) 512 The maximum number of virtual segments per query across the cluster. @@ -348,7 +347,6 @@ int 1 10000 - 100 http://git-wip-us.apache.org/repos/asf/ambari/blob/4f26b575/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/4f26b575/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": [