You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/12/19 00:54:45 UTC
git commit: AMBARI-4117. hbase.zookeeper.quorum and
templeton.zookeeper.hosts properties should be surfaced on web-ui. (jaimin)
Updated Branches:
refs/heads/trunk 55e45ef26 -> 778edc8dc
AMBARI-4117. hbase.zookeeper.quorum and templeton.zookeeper.hosts properties should be surfaced on web-ui. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/778edc8d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/778edc8d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/778edc8d
Branch: refs/heads/trunk
Commit: 778edc8dc4f12b3364770306279e6b90d9afb49d
Parents: 55e45ef
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Dec 18 15:54:19 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Dec 18 15:54:29 2013 -0800
----------------------------------------------------------------------
.../controllers/main/service/info/configs.js | 20 +-------------------
.../app/controllers/wizard/step8_controller.js | 16 +---------------
ambari-web/app/data/HDP2/config_mapping.js | 20 ++------------------
ambari-web/app/data/HDP2/site_properties.js | 20 ++++++++++++++++++++
ambari-web/app/data/config_mapping.js | 19 -------------------
ambari-web/app/data/site_properties.js | 20 ++++++++++++++++++++
ambari-web/app/models/service_config.js | 16 ++++++++++++++++
7 files changed, 60 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 22c0346..c54f542 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1270,25 +1270,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
},
_replaceConfigValues: function (name, express, value, globValue) {
- if (name === "templeton.zookeeper.hosts" || name === 'hbase.zookeeper.quorum') {
- var zooKeeperPort = '2181';
- if (typeof globValue === 'string') {
- var temp = [];
- temp.push(globValue);
- globValue = temp;
- }
- if (name === "templeton.zookeeper.hosts") {
- var temp = [];
- globValue.forEach(function (_host, index) {
- temp.push(globValue[index] + ':' + zooKeeperPort);
- }, this);
- globValue = temp;
- }
- value = value.replace(express, globValue.toString());
- } else {
- value = value.replace(express, globValue);
- }
- return value;
+ return value.replace(express, globValue);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 6f584fe..eafb26a 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -320,21 +320,7 @@ App.WizardStep8Controller = Em.Controller.extend({
},
_replaceConfigValues: function (name, express, value, globValue) {
- if (name === "templeton.zookeeper.hosts" || name === 'hbase.zookeeper.quorum') {
- // globValue is an array of ZooKeeper Server hosts
- var zooKeeperPort = '2181';
- if (name === "templeton.zookeeper.hosts") {
- var zooKeeperServers = globValue.map(function (item) {
- return item + ':' + zooKeeperPort;
- }).join(',');
- value = value.replace(express, zooKeeperServers);
- } else {
- value = value.replace(express, globValue.join(','));
- }
- } else {
- value = value.replace(express, globValue);
- }
- return value;
+ return value.replace(express, globValue);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
index f62162a..85156b1 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -97,27 +97,11 @@ var configs = [
"filename": "core-site.xml"
},
{
- "name": "fs.AbstractFileSystem.glusterfs.impl",
- "templateName": ["fs_AbstractFileSystem_glusterfs_impl"],
+ "name": "fs.AbstractFileSystem.glusterfs.impl",
+ "templateName": ["fs_AbstractFileSystem_glusterfs_impl"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "core-site.xml"
- },
-/**********************************************hbase-site***************************************/
- {
- "name": "hbase.zookeeper.quorum",
- "templateName": ["zookeeperserver_hosts"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "hbase-site.xml"
- },
-/**********************************************webhcat-site***************************************/
- {
- "name": "templeton.zookeeper.hosts",
- "templateName": ["zookeeperserver_hosts"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "webhcat-site.xml"
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 95ea021..f9c5c2a 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -683,6 +683,26 @@ module.exports =
"category": "General",
"serviceName": "HBASE",
"index": 5
+ },
+ {
+ "id": "site property",
+ "name": "hbase.zookeeper.quorum",
+ "displayName": "hbase.zookeeper.quorum",
+ "defaultValue": "",
+ "displayType": "multiLine",
+ "serviceName": "HBASE",
+ "category": "Advanced"
+ },
+
+ /**********************************************webhcat-site***************************************/
+ {
+ "id": "site property",
+ "name": "templeton.zookeeper.hosts",
+ "displayName": "templeton.zookeeper.hosts",
+ "defaultValue": "",
+ "displayType": "multiLine",
+ "serviceName": "WEBHCAT",
+ "category": "Advanced"
}
]
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/data/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/config_mapping.js b/ambari-web/app/data/config_mapping.js
index 66a3feb..91f5cdf 100644
--- a/ambari-web/app/data/config_mapping.js
+++ b/ambari-web/app/data/config_mapping.js
@@ -67,25 +67,6 @@ var configs = [
"isOverridable" : true
},
-/**********************************************hbase-site***************************************/
- {
- "name": "hbase.zookeeper.quorum",
- "templateName": ["zookeeperserver_hosts"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "hbase-site.xml"
- },
-
-/**********************************************webhcat-site***************************************/
-
- {
- "name": "templeton.zookeeper.hosts",
- "templateName": ["zookeeperserver_hosts"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "webhcat-site.xml"
- },
-
/**********************************************core-site for glusterfs***************************************/
{
"name": "fs.glusterfs.impl",
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index acdc2a8..d011717 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -690,6 +690,26 @@ module.exports =
"displayType": "checkbox",
"serviceName": "HBASE",
"category": "Advanced"
+ },
+ {
+ "id": "site property",
+ "name": "hbase.zookeeper.quorum",
+ "displayName": "hbase.zookeeper.quorum",
+ "defaultValue": "",
+ "displayType": "multiLine",
+ "serviceName": "HBASE",
+ "category": "Advanced"
+ },
+
+ /**********************************************webhcat-site***************************************/
+ {
+ "id": "site property",
+ "name": "templeton.zookeeper.hosts",
+ "displayName": "templeton.zookeeper.hosts",
+ "defaultValue": "",
+ "displayType": "multiLine",
+ "serviceName": "WEBHCAT",
+ "category": "Advanced"
}
]
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/778edc8d/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 2388f7e..f29e072 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -394,6 +394,22 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'zookeeperserver_hosts':
this.set('value', masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'));
break;
+ case 'hbase.zookeeper.quorum':
+ var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
+ this.setDefaultValue("(\\w*)", zkHosts);
+ break;
+ case 'templeton.zookeeper.hosts':
+ var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
+ var zkHostPort = zkHosts;
+ var regex = "\\w*:(\\d+)"; //regex to fetch the port
+ var portValue = this.get('defaultValue').match(new RegExp(regex));
+ if (portValue[1]) {
+ for ( var i = 0; i < zkHosts.length; i++ ) {
+ zkHostPort[i] = zkHosts[i] + ":" + portValue[1];
+ }
+ }
+ this.setDefaultValue("(.*)", zkHostPort);
+ break;
case 'dfs.name.dir':
case 'dfs.namenode.name.dir':
case 'dfs.data.dir':