Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B9E41830D for ; Wed, 17 Feb 2016 21:50:40 +0000 (UTC) Received: (qmail 18964 invoked by uid 500); 17 Feb 2016 21:50:31 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 18936 invoked by uid 500); 17 Feb 2016 21:50:31 -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 18926 invoked by uid 99); 17 Feb 2016 21:50:31 -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; Wed, 17 Feb 2016 21:50:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C8D0E020D; Wed, 17 Feb 2016 21:50:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaoki@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (bhuvnesh2703 via jaoki) Date: Wed, 17 Feb 2016 21:50:31 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.2 a088c7059 -> 52b72ac59 AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (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/52b72ac5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52b72ac5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52b72ac5 Branch: refs/heads/branch-2.2 Commit: 52b72ac5988cfa51eb4bf4fa7094f942b0cf7fb4 Parents: a088c70 Author: Jun Aoki Authored: Wed Feb 17 13:50:14 2016 -0800 Committer: Jun Aoki Committed: Wed Feb 17 13:50:14 2016 -0800 ---------------------------------------------------------------------- .../HAWQ/2.0.0/configuration/gpcheck-env.xml | 86 ------------------- .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 87 ++++++++++++++++++++ .../common-services/HAWQ/2.0.0/metainfo.xml | 2 +- .../2.0.0/package/scripts/hawq_constants.py | 2 +- .../HAWQ/2.0.0/package/scripts/master_helper.py | 2 +- .../HAWQ/2.0.0/package/scripts/params.py | 2 +- .../stacks/2.3/common/services-hawq-1-host.json | 2 +- .../2.3/common/services-hawq-3-hosts.json | 2 +- .../2.3/common/services-hawq-pxf-hdfs.json | 4 +- .../services-master_ambari_colo-3-hosts.json | 2 +- .../services-master_standby_colo-3-hosts.json | 2 +- .../common/services-normal-hawq-3-hosts.json | 2 +- .../services-standby_ambari_colo-3-hosts.json | 2 +- ambari-web/app/data/HDP2.3/site_properties.js | 4 +- ambari-web/app/models/stack_service.js | 4 +- 15 files changed, 103 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml deleted file mode 100755 index a61a34f..0000000 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - content - Content - Contents of the configuration file /usr/local/hawq/etc/gpcheck.cnf. This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host. This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation. - -[global] -configfile_version = 4 - -[linux.mount] -mount.points = / - -[linux.sysctl] -sysctl.kernel.shmmax = 500000000 -sysctl.kernel.shmmni = 4096 -sysctl.kernel.shmall = 4000000000 -sysctl.kernel.sem = 250 512000 100 2048 -sysctl.kernel.sysrq = 1 -sysctl.kernel.core_uses_pid = 1 -sysctl.kernel.msgmnb = 65536 -sysctl.kernel.msgmax = 65536 -sysctl.kernel.msgmni = 2048 -sysctl.net.ipv4.tcp_syncookies = 0 -sysctl.net.ipv4.ip_forward = 0 -sysctl.net.ipv4.conf.default.accept_source_route = 0 -sysctl.net.ipv4.tcp_tw_recycle = 1 -sysctl.net.ipv4.tcp_max_syn_backlog = 200000 -sysctl.net.ipv4.conf.all.arp_filter = 1 -sysctl.net.ipv4.ip_local_port_range = 1281 65535 -sysctl.net.core.netdev_max_backlog = 200000 -sysctl.vm.overcommit_memory = 2 -sysctl.fs.nr_open = 3000000 -sysctl.kernel.threads-max = 798720 -sysctl.kernel.pid_max = 798720 -# increase network -sysctl.net.core.rmem_max = 2097152 -sysctl.net.core.wmem_max = 2097152 - -[linux.limits] -soft.nofile = 2900000 -hard.nofile = 2900000 -soft.nproc = 131072 -hard.nproc = 131072 - -[linux.diskusage] -diskusage.monitor.mounts = / -diskusage.monitor.usagemax = 90% - -[hdfs] -dfs.mem.namenode.heap = 40960 -dfs.mem.datanode.heap = 6144 -# in hdfs-site.xml -dfs.support.append = true -dfs.client.enable.read.from.local = true -dfs.block.local-path-access.user = gpadmin -dfs.datanode.max.transfer.threads = 40960 -dfs.client.socket-timeout = 300000000 -dfs.datanode.socket.write.timeout = 7200000 -dfs.namenode.handler.count = 60 -ipc.server.handler.queue.size = 3300 -dfs.datanode.handler.count = 60 -ipc.client.connection.maxidletime = 3600000 -dfs.namenode.accesstime.precision = -1 - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml new file mode 100644 index 0000000..58bfa27 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml @@ -0,0 +1,87 @@ + + + + + + + + content + Content + Contents of the configuration file /usr/local/hawq/etc/hawq_check.cnf. This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host. This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation. + +[global] +configfile_version = 4 + +[linux.mount] +mount.points = / + +[linux.sysctl] +sysctl.kernel.shmmax = 500000000 +sysctl.kernel.shmmni = 4096 +sysctl.kernel.shmall = 4000000000 +sysctl.kernel.sem = 250 512000 100 2048 +sysctl.kernel.sysrq = 1 +sysctl.kernel.core_uses_pid = 1 +sysctl.kernel.msgmnb = 65536 +sysctl.kernel.msgmax = 65536 +sysctl.kernel.msgmni = 2048 +sysctl.net.ipv4.tcp_syncookies = 0 +sysctl.net.ipv4.ip_forward = 0 +sysctl.net.ipv4.conf.default.accept_source_route = 0 +sysctl.net.ipv4.tcp_tw_recycle = 1 +sysctl.net.ipv4.tcp_max_syn_backlog = 200000 +sysctl.net.ipv4.conf.all.arp_filter = 1 +sysctl.net.ipv4.ip_local_port_range = 1281 65535 +sysctl.net.core.netdev_max_backlog = 200000 +sysctl.vm.overcommit_memory = 2 +sysctl.fs.nr_open = 3000000 +sysctl.kernel.threads-max = 798720 +sysctl.kernel.pid_max = 798720 +# increase network +sysctl.net.core.rmem_max = 2097152 +sysctl.net.core.wmem_max = 2097152 + +[linux.limits] +soft.nofile = 2900000 +hard.nofile = 2900000 +soft.nproc = 131072 +hard.nproc = 131072 + +[linux.diskusage] +diskusage.monitor.mounts = / +diskusage.monitor.usagemax = 90% + +[hdfs] +dfs.mem.namenode.heap = 40960 +dfs.mem.datanode.heap = 6144 +# in hdfs-site.xml +dfs.support.append = true +dfs.client.enable.read.from.local = true +dfs.block.local-path-access.user = gpadmin +dfs.datanode.max.transfer.threads = 40960 +dfs.client.socket-timeout = 300000000 +dfs.datanode.socket.write.timeout = 7200000 +dfs.namenode.handler.count = 60 +ipc.server.handler.queue.size = 3300 +dfs.datanode.handler.count = 60 +ipc.client.connection.maxidletime = 3600000 +dfs.namenode.accesstime.precision = -1 + + + content + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml index 780a327..942b250 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml @@ -152,7 +152,7 @@ hawq-env hawq-site - gpcheck-env + hawq-check-env hdfs-client yarn-client hawq-limits-env http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py index 6a2d9ba..9fdbde5 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py @@ -48,7 +48,7 @@ sysctl_conf_dir = "/etc/sysctl.d" hawq_slaves_file = os.path.join(hawq_config_dir, "slaves") hawq_greenplum_path_file = os.path.join(hawq_home_dir, "greenplum_path.sh") hawq_hosts_file = "/tmp/hawq_hosts" -hawq_check_file = os.path.join(hawq_config_dir, "gpcheck.cnf") +hawq_check_file = os.path.join(hawq_config_dir, "hawq_check.cnf") sysctl_suse_file = "/etc/sysctl.conf" sysctl_backup_file = "/etc/sysctl.conf.backup.{0}" hawq_sysctl_filename = "hawq_sysctl.conf" http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py index 2e0b6da..c5f891b 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py @@ -34,7 +34,7 @@ def __setup_master_specific_conf_files(): """ import params - File(hawq_constants.hawq_check_file, content=params.gpcheck_content, owner=hawq_constants.hawq_user, group=hawq_constants.hawq_group, + File(hawq_constants.hawq_check_file, content=params.hawq_check_content, owner=hawq_constants.hawq_user, group=hawq_constants.hawq_group, mode=0644) File(hawq_constants.hawq_slaves_file, content=Template("slaves.j2"), owner=hawq_constants.hawq_user, group=hawq_constants.hawq_group, http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py index add3c63..48b933e 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py @@ -107,7 +107,7 @@ rm_host = __get_component_host('rm_host') yarn_ha_enabled = default('/configurations/yarn-site/yarn.resourcemanager.ha.enabled', False) # Config files -gpcheck_content = config['configurations']['gpcheck-env']['content'] +hawq_check_content = config['configurations']['hawq-check-env']['content'] # database user limits hawq_limits = config['configurations']['hawq-limits-env'] # sysctl parameters http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 53b3e08..5b2d58c 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 53b3e08..5b2d58c 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-server/src/test/python/stacks/2.3/common/services-hawq-pxf-hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-pxf-hdfs.json b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-pxf-hdfs.json index 4cd2d4d..0bf459d 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/services-hawq-pxf-hdfs.json +++ b/ambari-server/src/test/python/stacks/2.3/common/services-hawq-pxf-hdfs.json @@ -111,7 +111,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, @@ -3487,4 +3487,4 @@ ] } ] -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 876f577..df1dd74 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 f600e9b..d63d932 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 7a5a7b7..2ed5648 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/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 ca0637c..4f166a7 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 @@ -113,7 +113,7 @@ "service_name" : "HAWQ", "stack_name" : "HDP", "stack_version" : "2.3", - "type" : "gpcheck-env.xml" + "type" : "hawq-check-env.xml" }, "dependencies" : [ ] }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-web/app/data/HDP2.3/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js index 61cbe88..c5fb525 100644 --- a/ambari-web/app/data/HDP2.3/site_properties.js +++ b/ambari-web/app/data/HDP2.3/site_properties.js @@ -342,8 +342,8 @@ hdp23properties.push({ { "name": "content", "serviceName": "HAWQ", - "filename": "gpcheck-env.xml", - "category": "AdvancedGpcheck" + "filename": "hawq-check-env.xml", + "category": "AdvancedHawqCheck" } ); http://git-wip-us.apache.org/repos/asf/ambari/blob/52b72ac5/ambari-web/app/models/stack_service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index 0174530..d9edf6e 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -175,7 +175,7 @@ App.StackService = DS.Model.extend({ var configTypes = this.get('configTypes'); var serviceComponents = this.get('serviceComponents'); if (configTypes && Object.keys(configTypes).length) { - var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$", "AdvancedGpcheck"]; + var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$", "AdvancedHawqCheck"]; configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory) { var serviceComponentName = _configCategory.get('name'); var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName); @@ -371,7 +371,7 @@ App.StackService.configCategories = function () { case 'HAWQ': serviceConfigCategories.pushObjects([ App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}), - App.ServiceConfigCategory.create({ name: 'AdvancedGpcheck', displayName: 'Advanced gpcheck'}) + App.ServiceConfigCategory.create({ name: 'AdvancedHawqCheck', displayName: 'Advanced Hawq Check'}) ]); break; default: