You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/25 17:18:06 UTC
ambari git commit: AMBARI-11371. Enhance the logic of finding
available mount for hbase local dir (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 7102a7765 -> 0ee9f1676
AMBARI-11371. Enhance the logic of finding available mount for hbase local dir (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ee9f167
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ee9f167
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ee9f167
Branch: refs/heads/trunk
Commit: 0ee9f1676ab55cac4ee941ae368d2c97458233b6
Parents: 7102a77
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon May 25 18:04:40 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon May 25 18:18:02 2015 +0300
----------------------------------------------------------------------
ambari-web/app/data/BIGTOP/site_properties.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 2 +-
ambari-web/app/data/PHD/site_properties.js | 2 +-
.../app/utils/configs/config_property_helper.js | 11 -------
.../configs/config_property_helper_test.js | 33 --------------------
5 files changed, 3 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee9f167/ambari-web/app/data/BIGTOP/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/BIGTOP/site_properties.js b/ambari-web/app/data/BIGTOP/site_properties.js
index 831f576..c01ac87 100644
--- a/ambari-web/app/data/BIGTOP/site_properties.js
+++ b/ambari-web/app/data/BIGTOP/site_properties.js
@@ -683,7 +683,7 @@ module.exports =
{
"id": "site property",
"name": "hbase.tmp.dir",
- "displayName": "HBase local directory",
+ "displayName": "HBase tmp directory",
"defaultDirectory": "/hadoop/hbase",
"displayType": "directory",
"category": "Advanced hbase-site",
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee9f167/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 1b36ac5..d5310e2 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -671,7 +671,7 @@ var hdp2properties = [
{
"id": "site property",
"name": "hbase.tmp.dir",
- "displayName": "HBase local directory",
+ "displayName": "HBase tmp directory",
"defaultDirectory": "/hadoop/hbase",
"displayType": "directory",
"category": "Advanced hbase-site",
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee9f167/ambari-web/app/data/PHD/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/PHD/site_properties.js b/ambari-web/app/data/PHD/site_properties.js
index 733e8f4..f3eccfc 100644
--- a/ambari-web/app/data/PHD/site_properties.js
+++ b/ambari-web/app/data/PHD/site_properties.js
@@ -642,7 +642,7 @@ module.exports =
{
"id": "site property",
"name": "hbase.tmp.dir",
- "displayName": "HBase local directory",
+ "displayName": "HBase tmp directory",
"defaultDirectory": "/hadoop/hbase",
"displayType": "directory",
"category": "Advanced hbase-site",
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee9f167/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 63b7290..a98857d 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -288,11 +288,6 @@ module.exports = {
case 'log.dirs': // for Kafka Broker
this.unionAllMountPoints(configProperty, !isOnlyFirstOneNeeded, localDB);
break;
- case 'hbase.tmp.dir':
- if (configProperty.get('filename') == 'hbase-site.xml') {
- this.unionAllMountPoints(configProperty, isOnlyFirstOneNeeded, localDB);
- }
- break;
case 'fs.checkpoint.dir':
case 'dfs.namenode.checkpoint.dir':
case 'yarn.timeline-service.leveldb-timeline-store.path':
@@ -448,12 +443,6 @@ module.exports = {
setOfHostNames.push(component.hostName);
}, this);
break;
- case 'hbase.tmp.dir':
- temp = slaveComponentHostsInDB.findProperty('componentName', 'HBASE_REGIONSERVER');
- temp.hosts.forEach(function (host) {
- setOfHostNames.push(host.hostName);
- }, this);
- break;
case 'storm.local.dir':
temp = slaveComponentHostsInDB.findProperty('componentName', 'SUPERVISOR');
temp.hosts.forEach(function (host) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee9f167/ambari-web/test/utils/configs/config_property_helper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/configs/config_property_helper_test.js b/ambari-web/test/utils/configs/config_property_helper_test.js
index 1e48c54..bf1f651 100644
--- a/ambari-web/test/utils/configs/config_property_helper_test.js
+++ b/ambari-web/test/utils/configs/config_property_helper_test.js
@@ -204,18 +204,6 @@ describe('configPropertyHelper', function () {
title: 'should ignore ZooKeeper Server hostnames'
}
],
- 'hbase.tmp.dir': [
- {
- filename: 'hbase-site.xml',
- isUnionAllMountPointsCalled: true,
- title: 'unionAllMountPoints should be called'
- },
- {
- filename: 'ams-hbase-site.xml',
- isUnionAllMountPointsCalled: false,
- title: 'unionAllMountPoints shouldn\'t be called'
- }
- ],
'hivemetastore_host': {
localDB: {
masterComponentHosts: [
@@ -403,22 +391,6 @@ describe('configPropertyHelper', function () {
});
});
- cases['hbase.tmp.dir'].forEach(function (item) {
- var isOnlyFirstOneNeeded = true,
- localDB = {
- p: 'v'
- };
- it(item.title, function () {
- sinon.stub(configPropertyHelper, 'unionAllMountPoints', Em.K);
- serviceConfigProperty.setProperties({
- name: 'hbase.tmp.dir',
- filename: item.filename
- });
- configPropertyHelper.initialValue(serviceConfigProperty, localDB);
- expect(configPropertyHelper.unionAllMountPoints.calledWith(serviceConfigProperty, isOnlyFirstOneNeeded, localDB)).to.equal(item.isUnionAllMountPointsCalled);
- configPropertyHelper.unionAllMountPoints.restore();
- });
- });
it(cases['hivemetastore_host'].title, function () {
serviceConfigProperty.set('name', 'hivemetastore_host');
@@ -774,11 +746,6 @@ describe('configPropertyHelper', function () {
value: '/media/disk0/default'
},
{
- name: 'hbase.tmp.dir',
- isOnlyFirstOneNeeded: true,
- value: '/media/disk0/default'
- },
- {
name: 'storm.local.dir',
isOnlyFirstOneNeeded: true,
value: '/media/disk0/default'