Repository: ambari Updated Branches: refs/heads/branch-2.1 1f759df79 -> 2b31859c1
AMBARI-13083 Use recommendedValue instead of defaultDirectory attribute for site properties. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b31859c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b31859c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b31859c Branch: refs/heads/branch-2.1 Commit: 2b31859c14be95442aedb3ef7bffe6fafbe3ae1d Parents: 1f759df Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Mon Sep 14 11:40:26 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Mon Sep 21 12:03:26 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/data/BIGTOP/site_properties.js | 22 +++++++------- ambari-web/app/data/HDP2.2/site_properties.js | 1 - ambari-web/app/data/HDP2/ha_properties.js | 1 - ambari-web/app/data/HDP2/site_properties.js | 14 --------- .../configs/objects/service_config_property.js | 1 - ambari-web/app/utils/config.js | 6 ---- .../app/utils/configs/config_property_helper.js | 30 ++++++++++---------- ambari-web/test/utils/config_test.js | 1 - .../configs/config_property_helper_test.js | 2 +- 9 files changed, 26 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/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 2e46c93..93262ca 100644 --- a/ambari-web/app/data/BIGTOP/site_properties.js +++ b/ambari-web/app/data/BIGTOP/site_properties.js @@ -26,7 +26,7 @@ module.exports = { "name": "dfs.namenode.checkpoint.dir", "displayName": "SecondaryNameNode Checkpoint directories", - "defaultDirectory": "/hadoop/hdfs/namesecondary", + "recommendedValue": "/hadoop/hdfs/namesecondary", "displayType": "directories", "isOverridable": false, "serviceName": "HDFS", @@ -47,7 +47,7 @@ module.exports = { "name": "dfs.namenode.name.dir", "displayName": "NameNode directories", - "defaultDirectory": "/hadoop/hdfs/namenode", + "recommendedValue": "/hadoop/hdfs/namenode", "displayType": "directories", "isOverridable": false, "serviceName": "HDFS", @@ -89,7 +89,7 @@ module.exports = { "name": "dfs.datanode.data.dir", "displayName": "DataNode directories", - "defaultDirectory": "/hadoop/hdfs/data", + "recommendedValue": "/hadoop/hdfs/data", "displayType": "directories", "category": "DATANODE", "serviceName": "HDFS", @@ -214,7 +214,7 @@ module.exports = { "name": "yarn.nodemanager.log-dirs", "displayName": "yarn.nodemanager.log-dirs", - "defaultDirectory": "/hadoop/yarn/log", + "recommendedValue": "/hadoop/yarn/log", "displayType": "directories", "serviceName": "YARN", "filename": "yarn-site.xml", @@ -223,7 +223,7 @@ module.exports = { "name": "yarn.nodemanager.local-dirs", "displayName": "yarn.nodemanager.local-dirs", - "defaultDirectory": "/hadoop/yarn/local", + "recommendedValue": "/hadoop/yarn/local", "displayType": "directories", "serviceName": "YARN", "filename": "yarn-site.xml", @@ -276,7 +276,7 @@ module.exports = { "name": "yarn.timeline-service.leveldb-timeline-store.path", "displayName": "yarn.timeline-service.leveldb-timeline-store.path", - "defaultDirectory": "/hadoop/yarn/timeline", + "recommendedValue": "/hadoop/yarn/timeline", "category": "APP_TIMELINE_SERVER", "displayType": "directory", "serviceName": "YARN", @@ -615,7 +615,7 @@ module.exports = { "name": "hbase.tmp.dir", "displayName": "HBase tmp directory", - "defaultDirectory": "/hadoop/hbase", + "recommendedValue": "/hadoop/hbase", "displayType": "directory", "category": "Advanced hbase-site", "serviceName": "HBASE", @@ -796,7 +796,7 @@ module.exports = { "name": "storm.local.dir", "displayName": "storm.local.dir", - "defaultDirectory": "/hadoop/storm", + "recommendedValue": "/hadoop/storm", "displayType": "directory", "serviceName": "STORM", "category": "General" @@ -2660,8 +2660,7 @@ module.exports = "name": "oozie_data_dir", "displayName": "Oozie Data Dir", "description": "Data directory in which the Oozie DB exists", - "recommendedValue": "", - "defaultDirectory": "/hadoop/oozie/data", + "recommendedValue": "/hadoop/oozie/data", "isReconfigurable": true, "displayType": "directory", "isOverridable": false, @@ -2802,8 +2801,7 @@ module.exports = "name": "zk_data_dir", "displayName": "ZooKeeper directory", "description": "Data directory for ZooKeeper", - "recommendedValue": "", - "defaultDirectory": "/hadoop/zookeeper", + "recommendedValue": "/hadoop/zookeeper", "isReconfigurable": true, "displayType": "directory", "isVisible": true, http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/ambari-web/app/data/HDP2.2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js index d75190f..63060ea 100644 --- a/ambari-web/app/data/HDP2.2/site_properties.js +++ b/ambari-web/app/data/HDP2.2/site_properties.js @@ -66,7 +66,6 @@ hdp22properties.push( }, { "name": "yarn.timeline-service.leveldb-state-store.path", - "defaultDirectory": "/hadoop/yarn/timeline", "category": "APP_TIMELINE_SERVER", "displayType": "directory", "serviceName": "YARN", http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/ambari-web/app/data/HDP2/ha_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/ha_properties.js b/ambari-web/app/data/HDP2/ha_properties.js index 80294f4..dbbf81e 100644 --- a/ambari-web/app/data/HDP2/ha_properties.js +++ b/ambari-web/app/data/HDP2/ha_properties.js @@ -36,7 +36,6 @@ module.exports = "isReconfigurable": true, "recommendedValue": "/hadoop/hdfs/journal", "value": "/hadoop/hdfs/journal", - "defaultDirectory": "/hadoop/hdfs/journal", "displayType": "directory", "category": "HDFS", "filename": "hdfs-site", http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/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 0c37083..d641c81 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -23,7 +23,6 @@ var hdp2properties = [ /**********************************************HDFS***************************************/ { "name": "dfs.namenode.checkpoint.dir", - "defaultDirectory": "/hadoop/hdfs/namesecondary", "displayType": "directories", "serviceName": "HDFS", "filename": "hdfs-site.xml", @@ -40,7 +39,6 @@ var hdp2properties = [ }, { "name": "dfs.namenode.name.dir", - "defaultDirectory": "/hadoop/hdfs/namenode", "displayType": "directories", "serviceName": "HDFS", "filename": "hdfs-site.xml", @@ -73,7 +71,6 @@ var hdp2properties = [ }, { "name": "dfs.datanode.data.dir", - "defaultDirectory": "/hadoop/hdfs/data", "displayType": "directories", "category": "DATANODE", "serviceName": "HDFS", @@ -89,7 +86,6 @@ var hdp2properties = [ }, { "name": "nfs.file.dump.dir", - "defaultDirectory": "/tmp/.hdfs-nfs", "displayType": "directory", "category": "NFS_GATEWAY", "serviceName": "HDFS", @@ -341,7 +337,6 @@ var hdp2properties = [ }, { "name": "yarn.nodemanager.log-dirs", - "defaultDirectory": "/hadoop/yarn/log", "displayType": "directories", "serviceName": "YARN", "filename": "yarn-site.xml", @@ -349,7 +344,6 @@ var hdp2properties = [ }, { "name": "yarn.nodemanager.local-dirs", - "defaultDirectory": "/hadoop/yarn/local", "displayType": "directories", "serviceName": "YARN", "filename": "yarn-site.xml", @@ -629,7 +623,6 @@ var hdp2properties = [ }, { "name": "oozie_data_dir", - "defaultDirectory": "/hadoop/oozie/data", "displayType": "directory", "serviceName": "OOZIE", "filename": "oozie-env.xml", @@ -986,7 +979,6 @@ var hdp2properties = [ /**********************************************HBASE***************************************/ { "name": "hbase.tmp.dir", - "defaultDirectory": "/hadoop/hbase", "displayType": "directory", "category": "Advanced hbase-site", "serviceName": "HBASE", @@ -1218,7 +1210,6 @@ var hdp2properties = [ }, { "name": "storm.local.dir", - "defaultDirectory": "/hadoop/storm", "displayType": "directory", "serviceName": "STORM", "filename": "storm-site.xml", @@ -1800,7 +1791,6 @@ var hdp2properties = [ // Falcon Graph and Storage { "name": "*.falcon.graph.storage.directory", - "defaultDirectory": "/hadoop/falcon/data/lineage/graphdb", "displayType": "directory", "category": "FalconStartupSite", "serviceName": "FALCON", @@ -1808,7 +1798,6 @@ var hdp2properties = [ }, { "name": "*.falcon.graph.serialize.path", - "defaultDirectory": "/hadoop/falcon/data/lineage", "displayType": "directory", "category": "FalconStartupSite", "serviceName": "FALCON", @@ -1911,7 +1900,6 @@ var hdp2properties = [ }, { "name": "log.dirs", - "defaultDirectory": "/kafka-logs", "displayType": "directories", "serviceName": "KAFKA", "filename": "kafka-broker.xml", @@ -2521,7 +2509,6 @@ var hdp2properties = [ }, { "name": "dataDir", - "defaultDirectory": "/hadoop/zookeeper", "displayType": "directory", "serviceName": "ZOOKEEPER", "filename": "zoo.cfg.xml", @@ -3308,7 +3295,6 @@ var atsProperties = [ }, { "name": "yarn.timeline-service.leveldb-timeline-store.path", - "defaultDirectory": "/hadoop/yarn/timeline", "category": "APP_TIMELINE_SERVER", "displayType": "directory", "serviceName": "YARN", http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/ambari-web/app/models/configs/objects/service_config_property.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js index cc92ce4..a963629 100644 --- a/ambari-web/app/models/configs/objects/service_config_property.js +++ b/ambari-web/app/models/configs/objects/service_config_property.js @@ -78,7 +78,6 @@ App.ServiceConfigProperty = Em.Object.extend({ supportsFinal: false, retypedPassword: '', - defaultDirectory: '', description: '', displayType: 'string', // string, digits, number, directories, custom unit: '', http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 7d18532..68988bb 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -280,7 +280,6 @@ App.config = Em.Object.create({ recommendedIsFinal: null, supportsFinal: this.shouldSupportFinal(serviceName, fileName), serviceName: serviceName, - defaultDirectory: '', displayName: this.getDefaultDisplayName(name, fileName), displayType: this.getDefaultDisplayType(name, fileName, coreObject ? coreObject.value : ''), description: null, @@ -542,11 +541,6 @@ App.config = Em.Object.create({ if (advanced.get('id')) { configData = this.mergeStaticProperties(configData, advanced, null, ['name', 'filename']); - } - - if (['directory' ,'directories'].contains(configData.displayType) && configData.defaultDirectory) { - configData.value = configData.defaultDirectory; - } else if (advanced && advanced.get('id')) { configData.value = this.formatPropertyValue(advanced, advanced.get('value')); } http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/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 511a795..9b528dd 100644 --- a/ambari-web/app/utils/configs/config_property_helper.js +++ b/ambari-web/app/utils/configs/config_property_helper.js @@ -524,13 +524,13 @@ module.exports = { configProperty.set('value', ''); var winRegex = /^([a-z]):\\?$/; if (!isOnlyFirstOneNeeded) { + var mPoint = configProperty.get('value'); + if (!mPoint) { + mPoint = ""; + } allMountPoints.forEach(function (eachDrive) { - var mPoint = configProperty.get('value'); - if (!mPoint) { - mPoint = ""; - } if (eachDrive.mountpoint === "/") { - mPoint += configProperty.get('defaultDirectory') + "\n"; + mPoint += configProperty.get('recommendedValue') + "\n"; } else if(winRegex.test(eachDrive.mountpoint.toLowerCase())) { switch (configProperty.get('name')) { case 'dfs.name.dir': @@ -538,42 +538,42 @@ module.exports = { case 'dfs.data.dir': case 'dfs.datanode.data.dir': var winDriveUrl = eachDrive.mountpoint.toLowerCase().replace(winRegex, "file:///$1:"); - mPoint += winDriveUrl + configProperty.get('defaultDirectory') + "\n"; + mPoint += winDriveUrl + configProperty.get('recommendedValue') + "\n"; break; default: var winDrive = eachDrive.mountpoint.toLowerCase().replace(winRegex, "$1:"); - var winDir = configProperty.get('defaultDirectory').replace(/\//g, "\\"); + var winDir = configProperty.get('recommendedValue').replace(/\//g, "\\"); mPoint += winDrive + winDir + "\n"; } } else { - mPoint += eachDrive.mountpoint + configProperty.get('defaultDirectory') + "\n"; + mPoint += eachDrive.mountpoint + configProperty.get('recommendedValue') + "\n"; } - configProperty.set('value', mPoint); - configProperty.set('recommendedValue', mPoint); }, this); + configProperty.set('value', mPoint); + configProperty.set('recommendedValue', mPoint); } else { var mPoint = allMountPoints[0].mountpoint; if (mPoint === "/") { - mPoint = configProperty.get('defaultDirectory'); + mPoint = configProperty.get('recommendedValue'); } else if(winRegex.test(mPoint.toLowerCase())) { switch (configProperty.get('name')) { case 'fs.checkpoint.dir': case 'dfs.namenode.checkpoint.dir': var winDriveUrl = mPoint.toLowerCase().replace(winRegex, "file:///$1:"); - mPoint = winDriveUrl + configProperty.get('defaultDirectory') + "\n"; + mPoint = winDriveUrl + configProperty.get('recommendedValue') + "\n"; break; case 'zk_data_dir': var winDrive = mPoint.toLowerCase().replace(winRegex, "$1:"); - var winDir = configProperty.get('defaultDirectory').replace(/\//g, "\\\\"); + var winDir = configProperty.get('recommendedValue').replace(/\//g, "\\\\"); mPoint = winDrive + winDir + "\n"; break; default: var winDrive = mPoint.toLowerCase().replace(winRegex, "$1:"); - var winDir = configProperty.get('defaultDirectory').replace(/\//g, "\\"); + var winDir = configProperty.get('recommendedValue').replace(/\//g, "\\"); mPoint = winDrive + winDir + "\n"; } } else { - mPoint = mPoint + configProperty.get('defaultDirectory'); + mPoint = mPoint + configProperty.get('recommendedValue'); } configProperty.set('value', mPoint); configProperty.set('recommendedValue', mPoint); http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index 76bfe3d..75f8555 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -1060,7 +1060,6 @@ describe('App.config', function () { recommendedIsFinal: null, supportsFinal: true, serviceName: 'pServiceName', - defaultDirectory: '', displayName: 'pDisplayName', displayType: 'pDisplayType', description: null, http://git-wip-us.apache.org/repos/asf/ambari/blob/2b31859c/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 9541c65..960e4c3 100644 --- a/ambari-web/test/utils/configs/config_property_helper_test.js +++ b/ambari-web/test/utils/configs/config_property_helper_test.js @@ -825,7 +825,7 @@ describe('configPropertyHelper', function () { it(item.name, function () { serviceConfigProperty.setProperties({ name: item.name, - defaultDirectory: '/default' + recommendedValue: '/default' }); configPropertyHelper.unionAllMountPoints(serviceConfigProperty, item.isOnlyFirstOneNeeded, localDB); expect(serviceConfigProperty.get('value')).to.equal(item.value);
