You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/06/10 18:58:02 UTC
[2/2] ambari git commit: AMBARI-11845. Popup during enabling HDFS
ranger plugin should not happen for 2.2 stack (akovalenko)
AMBARI-11845. Popup during enabling HDFS ranger plugin should not happen for 2.2 stack (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c66fb49c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c66fb49c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c66fb49c
Branch: refs/heads/branch-2.1
Commit: c66fb49c2b21e21b40b1407043169bfb96393e64
Parents: 01ca283
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jun 10 19:54:46 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jun 10 19:57:28 2015 +0300
----------------------------------------------------------------------
ambari-web/app/utils/configs/modification_handlers/hdfs.js | 4 ++--
ambari-web/app/utils/configs/modification_handlers/misc.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c66fb49c/ambari-web/app/utils/configs/modification_handlers/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/modification_handlers/hdfs.js b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
index bd18a48..ad97e22 100644
--- a/ambari-web/app/utils/configs/modification_handlers/hdfs.js
+++ b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
@@ -26,13 +26,13 @@ module.exports = App.ServiceConfigModificationHandler.create({
var newValue = changedConfig.get("value");
var rangerPluginEnabledName = "ranger-hdfs-plugin-enabled";
var affectedPropertyName = changedConfig.get("name");
- if (affectedPropertyName == rangerPluginEnabledName) {
+ if (App.get('isHadoop23Stack') && affectedPropertyName == rangerPluginEnabledName) {
var configDfsPermissionsEnabled = this.getConfig(allConfigs, 'dfs.permissions.enabled', 'hdfs-site.xml', 'HDFS');
var configAttributesProviderClass = this.getConfig(allConfigs, 'dfs.namenode.inode.attributes.provider.class', 'hdfs-site.xml', 'HDFS');
var isAttributesProviderClassSet = typeof configAttributesProviderClass !== 'undefined';
var rangerPluginEnabled = newValue == "Yes";
- var newDfsPermissionsEnabled = rangerPluginEnabled ? "true" : "true";
+ var newDfsPermissionsEnabled = rangerPluginEnabled ? "true" : "false";
var newAttributesProviderClass = 'org.apache.ranger.authorization.hadoop.RangerHdfsAuthorizer';
// Add HDFS-Ranger configs
http://git-wip-us.apache.org/repos/asf/ambari/blob/c66fb49c/ambari-web/app/utils/configs/modification_handlers/misc.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/modification_handlers/misc.js b/ambari-web/app/utils/configs/modification_handlers/misc.js
index 2af27ef..449b830 100644
--- a/ambari-web/app/utils/configs/modification_handlers/misc.js
+++ b/ambari-web/app/utils/configs/modification_handlers/misc.js
@@ -65,7 +65,7 @@ module.exports = App.ServiceConfigModificationHandler.create({
currentUsers = currentAclValueSplits[0];
currentGroups = currentAclValueSplits[1];
} else {
- currentUsers = currentAclValueSplits.length > 0 ? currentAclValueSplits.shift() : ''
+ currentUsers = currentAclValueSplits.length > 0 ? currentAclValueSplits.shift() : '';
currentGroups = currentAclValueSplits.join(" ");
}
var currentUserList = currentUsers.split(',').filter(function(i) { return !Em.isEmpty(i); });