Repository: ambari Updated Branches: refs/heads/trunk e5f5a83ea -> 259ee9807
AMBARI-13156. Show custom section for HAWQ parameters (Newton Alex via odiachenko). Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/259ee980 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/259ee980 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/259ee980 Branch: refs/heads/trunk Commit: 259ee9807e5f41d91aeb9d746a5267881ff2d5c8 Parents: e5f5a83 Author: Oleksandr Diachenko <odiache...@pivotal.io> Authored: Mon Oct 12 13:03:51 2015 -0700 Committer: Oleksandr Diachenko <odiache...@pivotal.io> Committed: Mon Oct 12 13:03:51 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/data/HDP2.3/site_properties.js | 72 ++++++++++++++++++++ ambari-web/app/models/stack_service.js | 7 ++ .../app/utils/configs/config_property_helper.js | 26 +++++++ 3 files changed, 105 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/259ee980/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 12d1b9a..70fc4f2 100644 --- a/ambari-web/app/data/HDP2.3/site_properties.js +++ b/ambari-web/app/data/HDP2.3/site_properties.js @@ -243,6 +243,78 @@ hdp23properties.push({ "serviceName": "RANGER", "filename": "ranger-admin-site.xml", "category": "ADSettings" + }, + /*********HAWQ************/ + { + "name": "hawq_master_address_host", + "displayType": "masterHost", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 0 + }, + { + "name": "hawq_standby_address_host", + "displayType": "masterHost", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 1 + }, + { + "name": "hawq_master_address_port", + "displayType": "int", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 2 + }, + { + "name": "hawq_segment_address_port", + "displayType": "int", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 3 + }, + { + "name": "hawq_dfs_url", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 4 + }, + { + "name": "hawq_master_directory", + "displayType": "directory", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 5 + }, + { + "name": "hawq_master_temp_directory", + "displayType": "directory", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 6 + }, + { + "name": "hawq_segment_directory", + "displayType": "directory", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 7 + }, + { + "name": "hawq_segment_temp_directory", + "displayType": "directory", + "filename": "hawq-site.xml", + "category": "General", + "serviceName": "HAWQ", + "index": 8 } ); http://git-wip-us.apache.org/repos/asf/ambari/blob/259ee980/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 7300ae7..9541b36 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -364,6 +364,13 @@ App.StackService.configCategories = function () { break; case 'SQOOP': break; + + case 'HAWQ': + serviceConfigCategories.pushObjects([ + App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}) + ]); + break; + default: serviceConfigCategories.pushObjects([ App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}) http://git-wip-us.apache.org/repos/asf/ambari/blob/259ee980/ambari-web/app/utils/configs/config_property_helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/config_property_helper.js b/ambari-web/app/utils/configs/config_property_helper.js index 11f1d81..125c1f8 100644 --- a/ambari-web/app/utils/configs/config_property_helper.js +++ b/ambari-web/app/utils/configs/config_property_helper.js @@ -229,9 +229,35 @@ module.exports = { configProperty.set('recommendedValue', masterComponent.hostName); } break; + case 'hawq_master_address_host': + configProperty.set('value', masterComponentHostsInDB.findProperty('component', 'HAWQMASTER').hostName); + break; + case 'hawq_standby_address_host': + var hawqStandby = masterComponentHostsInDB.findProperty('component', 'HAWQSTANDBY'); + if (hawqStandby) { + configProperty.set('value', hawqStandby.hostName); + } + break; + case 'hawq_dfs_url': + var nnHost = masterComponentHostsInDB.findProperty('component', 'NAMENODE').hostName; + this.setRecommendedValue(configProperty, hostWithPort, nnHost); + break; + case 'hawq_resourcemanager_yarn_resourcemanager_address': + var rmHost = masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName; + if (rmHost) { + this.setRecommendedValue(configProperty, hostWithPort, rmHost); + } + break; + case 'hawq_resourcemanager_yarn_resourcemanager_scheduler_address': + var rmHost = masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName; + if (rmHost) { + this.setRecommendedValue(configProperty, hostWithPort, rmHost); + } + break; } }, + /** * Get hive.metastore.uris initial value * @param hosts