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/04/05 19:55:56 UTC
svn commit: r1465074 - in /incubator/ambari/trunk: ./
ambari-web/app/controllers/main/admin/security/
ambari-web/app/controllers/main/admin/security/add/ ambari-web/app/data/
Author: jaimin
Date: Fri Apr 5 17:55:56 2013
New Revision: 1465074
URL: http://svn.apache.org/r1465074
Log:
AMBARI-1816. Security wizard: Add missing secure configs to Hbase service and make zookeeper as default primary name for zookeeper principal. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js
incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 5 17:55:56 2013
@@ -558,6 +558,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1816. Security wizard: Add missing secure configs to Hbase service and
+ make "zookeeper" as default primary name for zookeeper principal. (jaimin)
+
AMBARI-1791. Can not specify request context for smoke test request. (swagle)
AMBARI-1788. JMX getSpec error filling up server logs. (swagle)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js Fri Apr 5 17:55:56 2013
@@ -105,7 +105,10 @@ App.MainAdminSecurityAddStep3Controller
currentStage.set('isCompleted', true);
this.moveToNextStage();
} else {
- this.loadClusterConfigs();
+ var self = this;
+ window.setTimeout(function () {
+ self.loadClusterConfigs();
+ }, 12000);
}
}
}
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js Fri Apr 5 17:55:56 2013
@@ -74,7 +74,10 @@ App.MainAdminSecurityDisableController =
currentStage.set('isCompleted', true);
this.moveToNextStage();
} else {
- this.loadClusterConfigs();
+ var self = this;
+ window.setTimeout(function () {
+ self.loadClusterConfigs();
+ }, 12000);
}
}
}
@@ -278,13 +281,29 @@ App.MainAdminSecurityDisableController =
_serviceConfigTags.configs.security_enabled = false;
} else {
this.get('configMapping').filterProperty('filename', _serviceConfigTags.siteName + '.xml').forEach(function (_config) {
- if (_config.name in _serviceConfigTags.configs) {
- if (_config.name === 'dfs.datanode.address') {
- _serviceConfigTags.configs[_config.name] = '0.0.0.0:50010';
- } else if (_config.name === 'dfs.datanode.http.address') {
- _serviceConfigTags.configs[_config.name] = '0.0.0.0:50075';
- } else {
- delete _serviceConfigTags.configs[_config.name];
+ var configName = _config.name;
+ if (configName in _serviceConfigTags.configs) {
+ switch (configName) {
+ case 'dfs.datanode.address':
+ _serviceConfigTags.configs[configName] = '0.0.0.0:50010';
+ break;
+ case 'dfs.datanode.http.address':
+ _serviceConfigTags.configs[configName] = '0.0.0.0:50075';
+ break;
+ case 'hbase.security.authentication':
+ _serviceConfigTags.configs[configName] = 'simple';
+ break;
+ case 'hbase.rpc.engine':
+ _serviceConfigTags.configs[configName] = 'org.apache.hadoop.hbase.ipc.WritableRpcEngine';
+ break;
+ case 'hbase.security.authorization':
+ _serviceConfigTags.configs[configName] = 'false';
+ break;
+ case 'hbase.coprocessor.master.classes':
+ _serviceConfigTags.configs[configName] = 'org.apache.hadoop.hbase.security.access.AccessController';
+ break;
+ default:
+ delete _serviceConfigTags.configs[configName];
}
}
console.log("Not Deleted" + _config.name);
Modified: incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_mapping.js?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_mapping.js Fri Apr 5 17:55:56 2013
@@ -774,6 +774,34 @@ module.exports = [
"filename": "hbase-site.xml"
},
{
+ "name": "hbase.security.authentication",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "simple",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.rpc.engine",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.ipc.WritableRpcEngine",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.security.authorization",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "false",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.coprocessor.master.classes",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.security.access.AccessController",
+ "filename": "hbase-site.xml"
+ },
+ {
"name": "templeton.hive.properties",
"templateName": ["hivemetastore_host"],
"foreignKey": null,
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js Fri Apr 5 17:55:56 2013
@@ -312,6 +312,48 @@ module.exports = [
"value": "hive.metastore.local=false, hive.metastore.uris=thrift://MetastoreHost_FQDN:9083, hive.q" +
"metastore.sasl.enabled=true,hive.metastore.execute.setugi= true, hive.exec.mode.local.auto=false, hive.metastore.kerberos.principal=<templateName[0]>/_HOST@EXAMPLE.COM",
"filename": "webhcat-site.xml"
+ },
+ {
+ "name": "hbase.coprocessor.region.classes",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.security.authentication",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "kerberos",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.rpc.engine",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.ipc.SecureRpcEngine",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.security.authorization",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "true",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.coprocessor.region.classes",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "name": "hbase.bulkload.staging.dir",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "/apps/hbase/staging",
+ "filename": "hbase-site.xml"
}
];
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_properties.js?rev=1465074&r1=1465073&r2=1465074&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_properties.js Fri Apr 5 17:55:56 2013
@@ -26,7 +26,7 @@ module.exports =
"defaultValue": "true",
"description": "Enable kerberos security for the cluster",
"isVisible": false,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -39,7 +39,7 @@ module.exports =
"description": "Path to installed kinit command",
"displayType": "principal",
"isVisible": false,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -51,7 +51,7 @@ module.exports =
"defaultValue": "MANUALLY_SET_KERBEROS",
"description": "Type of kerberos security for the cluster",
"isVisible": false,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -64,7 +64,7 @@ module.exports =
"description": "Type of kerberos security for the cluster",
"displayType": "principal",
"isVisible": false,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -77,7 +77,7 @@ module.exports =
"description": "Realm name to be used for all principal names",
"displayType": "advanced",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -90,7 +90,7 @@ module.exports =
"description": "Whether to use instance name for creating principals across cluster",
"displayType": "checkbox",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "GENERAL",
"category": "KERBEROS"
},
@@ -105,7 +105,7 @@ module.exports =
"description": "Primary name for NameNode",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "NameNode"
},
@@ -118,7 +118,7 @@ module.exports =
"description": "Keytab for NameNode",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "NameNode"
},
@@ -132,7 +132,7 @@ module.exports =
"description": "Primary name for spnego access for NameNode",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "General"
},
@@ -145,7 +145,7 @@ module.exports =
"description": "Keytab for http NameNode and SNameNode",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "General"
},
@@ -158,7 +158,7 @@ module.exports =
"description": "path to SecondaryNameNode keytab file",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "SNameNode"
},
@@ -171,7 +171,7 @@ module.exports =
"description": "Primary name for DataNode",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "DataNode"
},
@@ -184,7 +184,7 @@ module.exports =
"description": "Path to DataNode keytab file",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HDFS",
"category": "DataNode"
},
@@ -198,7 +198,7 @@ module.exports =
"description": "Primary name for JobTracker",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "MAPREDUCE",
"category": "JobTracker"
},
@@ -211,7 +211,7 @@ module.exports =
"description": "Path to JobTracker keytab file",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "MAPREDUCE",
"category": "JobTracker"
},
@@ -224,7 +224,7 @@ module.exports =
"description": "Primary name for TaskTracker",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "MAPREDUCE",
"category": "TaskTracker"
},
@@ -237,7 +237,7 @@ module.exports =
"description": "keytab for TaskTracker",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "MAPREDUCE",
"category": "TaskTracker"
},
@@ -252,7 +252,7 @@ module.exports =
"description": "Primary name for HBase master",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HBASE",
"category": "HBase Master"
},
@@ -265,7 +265,7 @@ module.exports =
"description": "keytab for HBase master",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HBASE",
"category": "HBase Master"
},
@@ -278,7 +278,7 @@ module.exports =
"description": "keytab for RegionServer",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HBASE",
"category": "RegionServer"
},
@@ -293,7 +293,7 @@ module.exports =
"description": "Primary name for Hive Metastore",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HIVE",
"category": "Hive Metastore"
},
@@ -306,7 +306,7 @@ module.exports =
"description": "keytab for Hive Metastore",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "HIVE",
"category": "Hive Metastore"
@@ -322,7 +322,7 @@ module.exports =
"description": "Oozie server host",
"displayType": "masterHosts",
"isVisible": false,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -335,7 +335,7 @@ module.exports =
"description": "Primary name for Oozie server",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -348,7 +348,7 @@ module.exports =
"description": "Keytab for Oozie server",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -362,7 +362,7 @@ module.exports =
"isReconfigurable": false,
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -375,7 +375,7 @@ module.exports =
"description": "Keytab for http Oozie server",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "OOZIE",
"category": "Oozie Server"
},
@@ -392,7 +392,7 @@ module.exports =
"displayType": "principal",
"isReconfigurable": false,
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "WEBHCAT",
"category": "WebHCat"
},
@@ -405,7 +405,7 @@ module.exports =
"description": "Keytab for http webHCat",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "WEBHCAT",
"category": "WebHCat"
},
@@ -422,7 +422,7 @@ module.exports =
"description": "Nagios server host",
"displayType": "masterHosts",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "NAGIOS",
"category": "General"
},
@@ -435,7 +435,7 @@ module.exports =
"description": "Primary name for Nagios server",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "NAGIOS",
"category": "General"
},
@@ -448,7 +448,7 @@ module.exports =
"description": "Keytab for nagios",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "NAGIOS",
"category": "General"
},
@@ -459,11 +459,12 @@ module.exports =
"name": "zookeeper_primary_name",
"displayName": "Primary name",
"value": "",
- "defaultValue": "zk",
+ "defaultValue": "zookeeper",
"description": "Primary name for ZooKeeper",
"displayType": "principal",
"isVisible": true,
- "isOverrideable": false,
+ "isReconfigurable": false,
+ "isOverridable": false,
"serviceName": "ZOOKEEPER",
"category": "ZooKeeper Server"
},
@@ -476,7 +477,7 @@ module.exports =
"description": "Keytab for ZooKeeper",
"displayType": "directory",
"isVisible": true,
- "isOverrideable": false,
+ "isOverridable": false,
"serviceName": "ZOOKEEPER",
"category": "ZooKeeper Server"
}