ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject ambari git commit: AMBARI-13156. Show custom section for HAWQ parameters (Newton Alex via odiachenko).
Date Wed, 07 Oct 2015 20:53:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 44c264666 -> 998c17132


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/998c1713
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/998c1713
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/998c1713

Branch: refs/heads/trunk
Commit: 998c17132bd3e18ebee72617747ad63725bbf510
Parents: 44c2646
Author: Oleksandr Diachenko <odiachenko@pivotal.io>
Authored: Wed Oct 7 13:53:45 2015 -0700
Committer: Oleksandr Diachenko <odiachenko@pivotal.io>
Committed: Wed Oct 7 13:53:45 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/data/HDP2.3/site_properties.js   | 81 ++++++++++++++++++++
 ambari-web/app/models/stack_service.js          |  7 ++
 .../app/utils/configs/config_property_helper.js | 26 +++++++
 3 files changed, 114 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/998c1713/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..3c1b4e7 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -243,6 +243,87 @@ hdp23properties.push({
     "serviceName": "RANGER",
     "filename": "ranger-admin-site.xml",
     "category": "ADSettings"
+  },
+  /*********HAWQ************/
+  {
+    "name": "hawq_master_address_host",
+    "displayName": "HAWQ Master",
+    "displayType": "masterHost",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 0
+  },
+  {
+    "name": "hawq_standby_address_host",
+    "displayName": "HAWQ Standby Master",
+    "displayType": "masterHost",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 1
+  },
+  {
+    "name": "hawq_master_address_port",
+    "displayName": "HAWQ Master Port",
+    "displayType": "int",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 2
+  },
+  {
+    "name": "hawq_segment_address_port",
+    "displayName": "HAWQ Segment Port",
+    "displayType": "int",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 3
+  },
+  {
+    "name": "hawq_dfs_url",
+    "displayName": "HAWQ DFS URL",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 4
+  },
+  {
+    "name": "hawq_master_directory",
+    "displayName": "HAWQ Master Directory",
+    "displayType": "directory",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 5
+  },
+  {
+    "name": "hawq_master_temp_directory",
+    "displayName": "HAWQ Master Temp Directory",
+    "displayType": "directory",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 6
+  },
+  {
+    "name": "hawq_segment_directory",
+    "displayName": "HAWQ Segment Directory",
+    "displayType": "directory",
+    "filename": "hawq-site.xml",
+    "category": "General",
+    "serviceName": "HAWQ",
+    "index": 7
+  },
+  {
+    "name": "hawq_segment_temp_directory",
+    "displayName": "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/998c1713/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/998c1713/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


Mime
View raw message