AMBARI-14997: Update gpcheck.cnf to hawq_check.cnf file as recommended in HAWQ documentation (bhuvnesh2703 via jaoki)

ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/gpcheck-env.xml → ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml

@@ -18,11 +18,11 @@
 -->
 
 <configuration supports_adding_forbidden="true">
-  <!-- gpcheck.cnf -->
+  <!-- hawq_check.cnf -->
     <property>
       <name>content</name>
       <display-name>Content</display-name>
-      <description>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.</description>
+      <description>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.</description>
         <value>
 [global]
 configfile_version = 4

ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml

@@ -152,7 +152,7 @@
       <configuration-dependencies>
         <config-type>hawq-env</config-type>
         <config-type>hawq-site</config-type>
-        <config-type>gpcheck-env</config-type>
+        <config-type>hawq-check-env</config-type>
         <config-type>hdfs-client</config-type>
         <config-type>yarn-client</config-type>
         <config-type>hawq-limits-env</config-type>

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"

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,

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

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" : [ ]
     }, {

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" : [ ]
     }, {

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 @@
       ]
     }
   ]
-}
+}

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" : [ ]
     }, {

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" : [ ]
     }, {

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" : [ ]
     }, {

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" : [ ]
     }, {

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"
   }
 );
 

ambari-web/app/models/stack_service.js

@@ -159,7 +159,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);
@@ -357,7 +357,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: