You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/05/20 13:14:31 UTC
[1/2] ambari git commit: Revert "Revert "Revert "AMBARI-4626.
"Capacity Scheduler" section in Ambari does not allow ACL value of "user
group" with spaces (aonishuk)"""
Repository: ambari
Updated Branches:
refs/heads/trunk 29410e60a -> 3761bda7c
Revert "Revert "Revert "AMBARI-4626. "Capacity Scheduler" section in Ambari does not allow ACL value of "user group" with spaces (aonishuk)"""
This reverts commit 1ee56761efaa9e049f37ff81cdbc69a096b0e494.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f97890f9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f97890f9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f97890f9
Branch: refs/heads/trunk
Commit: f97890f952d48672563808824a26f31448c3e535
Parents: 29410e6
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed May 20 12:33:31 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed May 20 12:33:31 2015 +0300
----------------------------------------------------------------------
.../providers/modify_properties_file.py | 4 +-
.../libraries/providers/properties_file.py | 2 +-
.../libraries/providers/xml_config.py | 2 +-
.../HDFS/2.1.0.2.0/configuration/core-site.xml | 4 +-
.../services/HBASE/configuration/hbase-site.xml | 4 +-
.../services/HDFS/configuration/core-site.xml | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 2 +-
.../HDFS/configuration/hdfs-site.xml.orig | 58 --
ambari-web/app/data/HDP2.2/site_properties.js | 40 -
.../app/data/HDP2.2/site_properties.js.orig | 830 -------------------
10 files changed, 11 insertions(+), 937 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index 661cb68..e71abb8 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -52,14 +52,14 @@ class ModifyPropertiesFileProvider(Provider):
in_var_value = line.split(delimiter)[1].strip()
if in_var_name in properties:
- value = InlineTemplate(unicode(properties[in_var_name])).get_content()
+ value = InlineTemplate(unicode(properties[in_var_name])).get_content().strip()
new_content_lines[line_num] = u"{0}{1}{2}".format(unicode(in_var_name), delimiter, value)
unsaved_values.remove(in_var_name)
else:
Logger.info(format("Creating new properties file as {filename} doesn't exist"))
for property_name in unsaved_values:
- value = InlineTemplate(unicode(properties[property_name])).get_content()
+ value = InlineTemplate(unicode(properties[property_name])).get_content().strip()
line = u"{0}{1}{2}".format(unicode(property_name), delimiter, value)
new_content_lines.append(line)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index 53459dd..1d21649 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -42,7 +42,7 @@ class PropertiesFileProvider(Provider):
config_content = InlineTemplate('''# Generated by Apache Ambari. {{time.asctime(time.localtime())}}
{% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(str(value)).get_content() }}{% endfor %}
+{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(str(value)).get_content().strip() }}{% endfor %}
''', extra_imports=[time, resource_management, resource_management.core, resource_management.core.source], properties_dict=self.resource.properties, key_value_delimiter=self.resource.key_value_delimiter)
Logger.info(format("Generating properties file: {filepath}"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index 0fed503..6f6c2a1 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -41,7 +41,7 @@ class XmlConfigProvider(Provider):
{% for key, value in configurations_dict|dictsort %}
<property>
<name>{{ key|e }}</name>
- <value>{{ resource_management.core.source.InlineTemplate(str(value)).get_content() |e }}</value>
+ <value>{{ resource_management.core.source.InlineTemplate(str(value)).get_content().strip() |e }}</value>
{%- if not configuration_attrs is none -%}
{%- for attrib_name, attrib_occurances in configuration_attrs.items() -%}
{%- for property_name, attrib_value in attrib_occurances.items() -%}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index c810d3c..eb14228 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -135,7 +135,9 @@
<property>
<name>hadoop.security.auth_to_local</name>
- <value>DEFAULT</value>
+ <value>
+ DEFAULT
+ </value>
<description>The mapping from kerberos principal names to local OS mapreduce.job.user.names.
So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component.
"omalley@APACHE.ORG" and "omalley/admin@APACHE.ORG" to "omalley", if your default domain is APACHE.ORG.
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index e832a79..85e3557 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -119,7 +119,7 @@
</property>
<property>
<name>hbase.regionserver.rpc.scheduler.factory.class</name>
- <value></value>
+ <value> </value>
<depends-on>
<property>
<type>hbase-env</type>
@@ -129,7 +129,7 @@
</property>
<property>
<name>hbase.rpc.controllerfactory.class</name>
- <value></value>
+ <value> </value>
<depends-on>
<property>
<type>hbase-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
index 12d2789..c1db0f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
@@ -30,7 +30,7 @@
<property>
<name>hadoop.security.key.provider.path</name>
- <value></value>
+ <value> </value>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
index 35cab99..d7bd90e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
@@ -42,7 +42,7 @@
<property>
<name>dfs.encryption.key.provider.uri</name>
- <value></value>
+ <value> </value>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml.orig b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml.orig
deleted file mode 100644
index d7bd90e..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true">
-
- <property>
- <name>dfs.namenode.startup.delay.block.deletion.sec</name>
- <value>3600</value>
- <description></description>
- </property>
-
- <property>
- <name>dfs.journalnode.edits.dir</name>
- <value>/hadoop/hdfs/journalnode</value>
- <description>The path where the JournalNode daemon will store its local state. </description>
- </property>
-
- <property>
- <name>dfs.client.retry.policy.enabled</name>
- <value>true</value>
- <description>Enables HDFS client retry in the event of a NameNode failure.</description>
- </property>
-
- <property>
- <name>dfs.encryption.key.provider.uri</name>
- <value> </value>
- <depends-on>
- <property>
- <type>hadoop-env</type>
- <name>keyserver_host</name>
- </property>
- <property>
- <type>hadoop-env</type>
- <name>keyserver_port</name>
- </property>
- </depends-on>
- </property>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/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 8cb9665..537fa84 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -109,26 +109,6 @@ hdp22properties.push(
},
{
"id": "site property",
- "name": "hadoop.security.key.provider.path",
- "displayName": "hadoop.security.key.provider.path",
- "defaultValue": "",
- "isRequired": false,
- "category": "Advanced core-site",
- "serviceName": "HDFS",
- "filename": "core-site.xml"
- },
- {
- "id": "site property",
- "name": "dfs.encryption.key.provider.uri",
- "displayName": "dfs.encryption.key.provider.uri",
- "defaultValue": "",
- "isRequired": false,
- "category": "Advanced hdfs-site",
- "serviceName": "HDFS",
- "filename": "hdfs-site.xml"
- },
- {
- "id": "site property",
"name": "*.falcon.graph.blueprints.graph",
"displayName": "*.falcon.graph.blueprints.graph",
"category": "FalconStartupSite",
@@ -832,26 +812,6 @@ hdp22properties.push(
"category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
- },
- {
- "id": "site property",
- "name": "hbase.regionserver.rpc.scheduler.factory.class",
- "displayName": "hbase.regionserver.rpc.scheduler.factory.class",
- "defaultValue": "",
- "isRequired": false,
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "id": "site property",
- "name": "hbase.rpc.controllerfactory.class",
- "displayName": "hbase.rpc.controllerfactory.class",
- "defaultValue": "",
- "isRequired": false,
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
}
);
http://git-wip-us.apache.org/repos/asf/ambari/blob/f97890f9/ambari-web/app/data/HDP2.2/site_properties.js.orig
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js.orig b/ambari-web/app/data/HDP2.2/site_properties.js.orig
deleted file mode 100644
index 537fa84..0000000
--- a/ambari-web/app/data/HDP2.2/site_properties.js.orig
+++ /dev/null
@@ -1,830 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var hdp22SepcificProperties = [
- require('data/HDP2.2/yarn_properties'),
- require('data/HDP2.2/tez_properties'),
- require('data/HDP2.2/hive_properties')
-].reduce(function(p, c) { return c.concat(p); });
-
-var hdp2properties = require('data/HDP2/site_properties').configProperties;
-var excludedConfigs = [
- 'storm.thrift.transport', //In HDP2.2 storm.thrift.transport property is computed on server
- 'storm_rest_api_host',
- 'tez.am.container.session.delay-allocation-millis',
- 'tez.am.grouping.max-size',
- 'tez.am.grouping.min-size',
- 'tez.am.grouping.split-waves',
- 'tez.am.java.opts',
- 'tez.runtime.intermediate-input.compress.codec',
- 'tez.runtime.intermediate-input.is-compressed',
- 'tez.runtime.intermediate-output.compress.codec',
- 'tez.runtime.intermediate-output.should-compress',
- 'dfs.datanode.data.dir',
- 'hive.heapsize'
-];
-var hdp22properties = hdp2properties.filter(function (item) {
- return !excludedConfigs.contains(item.name);
-});
-
-hdp22properties.push(
- {
- "id": "site property",
- "name": "hive.zookeeper.quorum",
- "displayName": "hive.zookeeper.quorum",
- "recommendedValue": "localhost:2181",
- "displayType": "multiLine",
- "isRequired": false,
- "isVisible": true,
- "serviceName": "HIVE",
- "filename": "hive-site.xml",
- "category": "Advanced hive-site"
- },
- {
- "id": "site property",
- "name": "hadoop.registry.rm.enabled",
- "displayName": "hadoop.registry.rm.enabled",
- "recommendedValue": "false",
- "displayType": "checkbox",
- "isVisible": true,
- "serviceName": "YARN",
- "filename": "yarn-site.xml",
- "category": "Advanced yarn-site"
- },
- {
- "id": "site property",
- "name": "hadoop.registry.zk.quorum",
- "displayName": "hadoop.registry.zk.quorum",
- "recommendedValue": "localhost:2181",
- "isVisible": true,
- "serviceName": "YARN",
- "filename": "yarn-site.xml",
- "category": "Advanced yarn-site"
- },
- {
- "id": "site property",
- "name": "yarn.timeline-service.leveldb-state-store.path",
- "displayName": "yarn.timeline-service.leveldb-state-store.path",
- "defaultDirectory": "/hadoop/yarn/timeline",
- "category": "APP_TIMELINE_SERVER",
- "displayType": "directory",
- "serviceName": "YARN",
- "filename": "yarn-site.xml"
- },
- {
- "id": "site property",
- "name": "yarn.timeline-service.state-store-class",
- "displayName": "yarn.timeline-service.state-store-class",
- "category": "APP_TIMELINE_SERVER",
- "serviceName": "YARN",
- "filename": "yarn-site.xml"
- },
- {
- "id": "site property",
- "name": "dfs.datanode.data.dir",
- "displayName": "DataNode directories",
- "defaultDirectory": "/hadoop/hdfs/data",
- "displayType": "datanodedirs",
- "category": "DATANODE",
- "serviceName": "HDFS",
- "filename": "hdfs-site.xml",
- "index": 1
- },
- {
- "id": "site property",
- "name": "*.falcon.graph.blueprints.graph",
- "displayName": "*.falcon.graph.blueprints.graph",
- "category": "FalconStartupSite",
- "serviceName": "FALCON",
- "filename": "falcon-startup.properties.xml"
- },
- {
- "id": "site property",
- "name": "*.falcon.graph.storage.backend",
- "displayName": "*.falcon.graph.storage.backend",
- "category": "FalconStartupSite",
- "serviceName": "FALCON",
- "filename": "falcon-startup.properties.xml"
- },
- /*********RANGER FOR HDFS************/
- {
- "id": "site property",
- "name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayName": "Audit to HDFS",
- "displayType": "checkbox",
- "dependentConfigPattern": "^XAAUDIT.HDFS",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
- {
- "id": "site property",
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayName": "Audit to DB",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
- {
- "id": "site property",
- "name": "ranger-hdfs-plugin-enabled",
- "displayType": "checkbox",
- "displayName": "Enable Ranger for HDFS",
- "isOverridable": false,
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS",
- "index": 1
- },
- {
- "id": "site property",
- "name": "policy_user",
- "value": "ambari-qa",
- "recommendedValue": "ambari-qa",
- "displayName": "policy User for HDFS",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
- {
- "id": "site property",
- "name": "REPOSITORY_CONFIG_USERNAME",
- "displayName": "Ranger repository config user",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
- "serviceName": "HDFS"
- },
- /*********RANGER FOR HIVE************/
- {
- "id": "site property",
- "name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayName": "Audit to HDFS",
- "displayType": "checkbox",
- "dependentConfigPattern": "^XAAUDIT.HDFS",
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE"
- },
- {
- "id": "site property",
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayName": "Audit to DB",
- "displayType": "checkbox",
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE"
- },
- {
- "id": "site property",
- "name": "ranger-hive-plugin-enabled",
- "displayType": "checkbox",
- "displayName": "Enable Ranger for HIVE",
- "isOverridable": false,
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE",
- "index": 1
- },
- {
- "id": "site property",
- "name": "policy_user",
- "value": "ambari-qa",
- "recommendedValue": "ambari-qa",
- "displayName": "policy User for HIVE",
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE"
- },
- {
- "id": "site property",
- "name": "REPOSITORY_CONFIG_USERNAME",
- "displayName": "Ranger repository config user",
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE"
- },
- {
- "id": "site property",
- "name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
- "recommendedValue": true,
- "displayType": "checkbox",
- "displayName": "Should Hive GRANT/REVOKE update XA policies?",
- "filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
- "serviceName": "HIVE"
- },
- /*********RANGER FOR HBASE************/
- {
- "id": "site property",
- "name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayName": "Audit to HDFS",
- "displayType": "checkbox",
- "dependentConfigPattern": "^XAAUDIT.HDFS",
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE"
- },
- {
- "id": "site property",
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayName": "Audit to DB",
- "displayType": "checkbox",
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE"
- },
- {
- "id": "site property",
- "name": "ranger-hbase-plugin-enabled",
- "displayType": "checkbox",
- "displayName": "Enable Ranger for HBASE",
- "isOverridable": false,
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE",
- "index": 1
- },
- {
- "id": "site property",
- "name": "policy_user",
- "value": "ambari-qa",
- "recommendedValue": "ambari-qa",
- "displayName": "policy User for HBASE",
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE"
- },
- {
- "id": "site property",
- "name": "REPOSITORY_CONFIG_USERNAME",
- "displayName": "Ranger repository config user",
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE"
- },
- {
- "id": "site property",
- "name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
- "recommendedValue": true,
- "displayName": "Should HBase GRANT/REVOKE update XA policies?",
- "displayType": "checkbox",
- "filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
- "serviceName": "HBASE"
- },
- /*********RANGER FOR STORM************/
- {
- "id": "site property",
- "name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayName": "Audit to HDFS",
- "displayType": "checkbox",
- "dependentConfigPattern": "^XAAUDIT.HDFS",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
- {
- "id": "site property",
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayName": "Audit to DB",
- "displayType": "checkbox",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
- {
- "id": "site property",
- "name": "ranger-storm-plugin-enabled",
- "displayType": "checkbox",
- "displayName": "Enable Ranger for STORM",
- "isOverridable": false,
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM",
- "index": 1
- },
- {
- "id": "site property",
- "name": "policy_user",
- "value": "ambari-qa",
- "recommendedValue": "ambari-qa",
- "displayName": "policy User for STORM",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
- {
- "id": "site property",
- "name": "REPOSITORY_CONFIG_USERNAME",
- "displayName": "Ranger repository config user",
- "filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
- "serviceName": "STORM"
- },
- /*********RANGER FOR KNOX************/
- {
- "id": "site property",
- "name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayName": "Audit to HDFS",
- "displayType": "checkbox",
- "dependentConfigPattern": "^XAAUDIT.HDFS",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- {
- "id": "site property",
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayName": "Audit to DB",
- "displayType": "checkbox",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- {
- "id": "site property",
- "name": "ranger-knox-plugin-enabled",
- "displayType": "checkbox",
- "displayName": "Enable Ranger for KNOX",
- "isOverridable": false,
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX",
- "index": 1
- },
- {
- "id": "site property",
- "name": "policy_user",
- "value": "ambari-qa",
- "recommendedValue": "ambari-qa",
- "displayName": "policy User for KNOX",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- {
- "id": "site property",
- "name": "REPOSITORY_CONFIG_USERNAME",
- "displayName": "Ranger repository config user",
- "filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
- "serviceName": "KNOX"
- },
- /**********************************************SPARK***************************************/
- {
- "id": "site property",
- "name": "spark.driver.extraJavaOptions",
- "displayName": "spark.driver.extraJavaOptions",
- "recommendedValue": "",
- "isRequired": false,
- "category": "Advanced spark-defaults",
- "serviceName": "SPARK",
- "filename": "spark-defaults.xml"
- },
- {
- "id": "site property",
- "name": "spark.yarn.am.extraJavaOptions",
- "displayName": "spark.yarn.am.extraJavaOptions",
- "recommendedValue": "",
- "isRequired": false,
- "category": "Advanced spark-defaults",
- "serviceName": "SPARK",
- "filename": "spark-defaults.xml"
- },
- /**********************************************RANGER***************************************/
- {
- "id": "site property",
- "name": "ranger_admin_password",
- "displayName": "Ranger Admin user's password for Ambari",
- "recommendedValue": "ambari",
- "isReconfigurable": true,
- "displayType": "password",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "ranger-env.xml",
- "category": "AdminSettings"
- },
- {
- "id": "site property",
- "name": "SQL_CONNECTOR_JAR",
- "displayName": "Location of Sql Connector Jar",
- "recommendedValue": "/usr/share/java/mysql-connector-java.jar",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "AdminSettings"
- },
- {
- "id": "site property",
- "name": "DB_FLAVOR",
- "displayName": "DB FLAVOR",
- "value": "MYSQL",
- "recommendedValue": "MYSQL",
- "isReconfigurable": true,
- "options": [
- {
- displayName: 'MYSQL'
- },
- {
- displayName: 'ORACLE'
- }
- ],
- "displayType": "radio button",
- "radioName": "RANGER DB_FLAVOR",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "SQL_COMMAND_INVOKER",
- "displayName": "SQL Command Invoker",
- "recommendedValue": "mysql",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "db_host",
- "displayName": "Ranger DB host",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "db_root_user",
- "displayName": "Ranger DB root user",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "db_root_password",
- "displayName": "Ranger DB root password",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "password",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "db_name",
- "displayName": "Ranger DB name",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
-
- {
- "id": "site property",
- "name": "db_user",
- "displayName": "Ranger DB username",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "db_password",
- "displayName": "Ranger DB password",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "password",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "audit_db_name",
- "displayName": "Ranger Audit DB name",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "audit_db_user",
- "displayName": "Ranger Audit DB username",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "site property",
- "name": "audit_db_password",
- "displayName": "Ranger Audit DB password",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "password",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings"
- },
- {
- "id": "puppet var",
- "name": "policymgr_external_url",
- "displayName": "External URL",
- "recommendedValue": "http://localhost:6080",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "RangerSettings"
- },
- {
- "id": "puppet var",
- "name": "policymgr_http_enabled",
- "displayName": "HTTP enabled",
- "recommendedValue": true,
- "isReconfigurable": true,
- "displayType": "checkbox",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "RangerSettings"
- },
- {
- "id": "puppet var",
- "name": "ranger_user",
- "displayName": "Used to create user and assign permission",
- "recommendedValue": "ranger",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "ranger-env.xml",
- "category": "RangerSettings"
- },
- {
- "id": "puppet var",
- "name": "ranger_group",
- "displayName": "Used to create group and assign permission",
- "recommendedValue": "ranger",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "ranger-env.xml",
- "category": "RangerSettings"
- },
- {
- "id": "site property",
- "name": "authentication_method",
- "displayName": "Authentication method",
- "recommendedValue": "NONE",
- "options": [
- {
- displayName: 'LDAP',
- foreignKeys: ['xa_ldap_userDNpattern', 'xa_ldap_groupRoleAttribute', 'xa_ldap_url', 'xa_ldap_groupSearchBase', 'xa_ldap_groupSearchFilter']
- },
- {
- displayName: 'ACTIVE_DIRECTORY',
- foreignKeys: ['xa_ldap_ad_domain', 'xa_ldap_ad_url']
- },
- {
- displayName: 'UNIX',
- foreignKeys: ['remoteLoginEnabled', 'authServiceHostName', 'authServicePort']
- },
- {
- displayName: 'NONE'
- }
- ],
- "displayType": "radio button",
- "radioName": "authentication-method",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "RangerSettings"
- },
- {
- "id": "site property",
- "name": "remoteLoginEnabled",
- "displayName": "Allow remote Login",
- "recommendedValue": true,
- "isReconfigurable": true,
- "displayType": "checkbox",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "UnixAuthenticationSettings"
- },
- {
- "id": "site property",
- "name": "authServiceHostName",
- "displayName": "authServiceHostName",
- "recommendedValue": 'localhost',
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "UnixAuthenticationSettings"
- },
- {
- "id": "site property",
- "name": "authServicePort",
- "displayName": "authServicePort",
- "recommendedValue": '5151',
- "isReconfigurable": true,
- "displayType": "int",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "UnixAuthenticationSettings"
- },
- {
- "id": "site property",
- "name": "xa_ldap_url",
- "displayName": "xa_ldap_url",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "LDAPSettings"
- },
- {
- "id": "site property",
- "name": "xa_ldap_userDNpattern",
- "displayName": "xa_ldap_userDNpattern",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "LDAPSettings"
- },
- {
- "id": "site property",
- "name": "xa_ldap_groupRoleAttribute",
- "displayName": "xa_ldap_groupRoleAttribute",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "LDAPSettings"
- },
- {
- "id": "site property",
- "name": "xa_ldap_ad_domain",
- "displayName": "xa_ldap_ad_domain",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "ADSettings"
- },
- {
- "id": "site property",
- "name": "xa_ldap_ad_url",
- "displayName": "xa_ldap_ad_url",
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "ADSettings"
- },
- {
- "id": "site property",
- "name": "hbase.bucketcache.ioengine",
- "displayName": "hbase.bucketcache.ioengine",
- "isRequired": false,
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "id": "site property",
- "name": "hbase.bucketcache.size",
- "displayName": "hbase.bucketcache.size",
- "displayType": "int",
- "isRequired": false,
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "id": "site property",
- "name": "hbase.bucketcache.percentage.in.combinedcache",
- "displayName": "hbase.bucketcache.percentage.in.combinedcache",
- "displayType": "float",
- "isRequired": false,
- "serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
- },
- {
- "id": "site property",
- "name": "hbase_max_direct_memory_size",
- "displayName": "HBase off-heap MaxDirectMemorySize",
- "displayType": "int",
- "isRequired": false,
- "serviceName": "HBASE",
- "filename": "hbase-env.xml",
- "category": "Advanced hbase-env"
- },
- {
- "id": "site property",
- "name": "hbase.regionserver.global.memstore.size",
- "displayName": "hbase.regionserver.global.memstore.size",
- "category": "Advanced hbase-site",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- }
-);
-
-var additionalProperties = [];
-
-hdp22SepcificProperties.forEach(function (config) {
- if (!hdp22properties.findProperty('name', config.name)) additionalProperties.push(config);
- else {
- hdp22properties.findProperty('name', config.name).category = config.category;
- }
-});
-
-module.exports =
-{
- "configProperties": hdp22properties.concat(additionalProperties)
-};
[2/2] ambari git commit: AMBARI-11263. Optimize creating users and
groups (aonishuk)
Posted by ao...@apache.org.
AMBARI-11263. Optimize creating users and groups (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3761bda7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3761bda7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3761bda7
Branch: refs/heads/trunk
Commit: 3761bda7cb54e7cfe90e0046f99345337f55c6d1
Parents: f97890f
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed May 20 14:14:17 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed May 20 14:14:17 2015 +0300
----------------------------------------------------------------------
.../TestDirectoryResource.py | 33 ++++----
.../resource_management/TestExecuteResource.py | 17 ----
.../resource_management/TestFileResource.py | 30 ++++---
.../resource_management/TestGroupResource.py | 22 +++--
.../resource_management/TestUserResource.py | 33 +++++---
.../core/providers/accounts.py | 84 ++++++++++++--------
.../core/providers/system.py | 24 +++---
.../python/resource_management/core/sudo.py | 15 ++--
.../python/resource_management/core/utils.py | 25 ------
9 files changed, 147 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py b/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
index 7667a2d..e57ed67 100644
--- a/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
@@ -22,6 +22,8 @@ import os
from resource_management.core.system import System
from resource_management.core import Environment, Fail, sudo
from resource_management.core.resources import Directory
+import pwd
+import grp
@patch.object(System, "os_family", new = 'redhat')
class TestDirectoryResource(TestCase):
@@ -32,16 +34,19 @@ class TestDirectoryResource(TestCase):
@patch.object(sudo, "stat")
@patch.object(sudo,"chmod")
@patch.object(sudo,"chown")
- @patch("resource_management.core.providers.system._coerce_uid")
- @patch("resource_management.core.providers.system._coerce_gid")
- def test_create_directory_recursive(self, _coerce_gid_mock, _coerce_uid_mock,
+ @patch.object(pwd, "getpwnam")
+ @patch.object(grp, "getgrnam")
+ def test_create_directory_recursive(self, getgrnam_mock, getpwnam_mock,
os_chown_mock, os_chmod_mock, os_stat_mock,
isdir_mock, os_makedirs_mock,
os_path_exists_mock):
os_path_exists_mock.return_value = False
isdir_mock.return_value = True
- _coerce_uid_mock.return_value = 66
- _coerce_gid_mock.return_value = 77
+ getpwnam_mock.return_value = MagicMock()
+ getpwnam_mock.return_value.pw_uid = 66
+ getgrnam_mock.return_value = MagicMock()
+ getgrnam_mock.return_value.gr_gid = 77
+
os_stat_mock.return_value = type("", (), dict(st_mode=0755, st_uid=0, st_gid=0))()
with Environment('/') as env:
@@ -55,8 +60,7 @@ class TestDirectoryResource(TestCase):
os_makedirs_mock.assert_called_with('/a/b/c/d', 0777)
os_chmod_mock.assert_called_with('/a/b/c/d', 0777)
- os_chown_mock.assert_any_call('/a/b/c/d', 'hdfs', None)
- os_chown_mock.assert_any_call('/a/b/c/d', None, 'hadoop')
+ os_chown_mock.assert_any_call('/a/b/c/d', getpwnam_mock.return_value, getgrnam_mock.return_value)
@patch.object(sudo, "path_exists")
@patch.object(os.path, "dirname")
@@ -65,17 +69,19 @@ class TestDirectoryResource(TestCase):
@patch.object(sudo, "stat")
@patch.object(sudo,"chmod")
@patch.object(sudo,"chown")
- @patch("resource_management.core.providers.system._coerce_uid")
- @patch("resource_management.core.providers.system._coerce_gid")
- def test_create_directory_not_recursive(self, _coerce_gid_mock, _coerce_uid_mock,
+ @patch.object(pwd, "getpwnam")
+ @patch.object(grp, "getgrnam")
+ def test_create_directory_not_recursive(self, getgrnam_mock, getpwnam_mock,
os_chown_mock, os_chmod_mock, os_stat_mock,
mkdir_mock, isdir_mock, os_dirname_mock,
os_path_exists_mock):
os_path_exists_mock.return_value = False
os_dirname_mock.return_value = "/a/b/c"
isdir_mock.return_value = True
- _coerce_uid_mock.return_value = 66
- _coerce_gid_mock.return_value = 77
+ getpwnam_mock.return_value = MagicMock()
+ getpwnam_mock.return_value.pw_uid = 66
+ getgrnam_mock.return_value = MagicMock()
+ getpwnam_mock.return_value.gr_gid = 77
os_stat_mock.return_value = type("", (), dict(st_mode=0755, st_uid=0, st_gid=0))()
with Environment('/') as env:
@@ -88,8 +94,7 @@ class TestDirectoryResource(TestCase):
mkdir_mock.assert_called_with('/a/b/c/d', 0777)
os_chmod_mock.assert_called_with('/a/b/c/d', 0777)
- os_chown_mock.assert_any_call('/a/b/c/d', 'hdfs', None)
- os_chown_mock.assert_any_call('/a/b/c/d', None, 'hadoop')
+ os_chown_mock.assert_any_call('/a/b/c/d', getpwnam_mock.return_value, getgrnam_mock.return_value)
@patch.object(sudo, "path_exists")
@patch.object(os.path, "dirname")
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
index d92f905..59d7e4c 100644
--- a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
@@ -133,23 +133,6 @@ class TestExecuteResource(TestCase):
except Fail as e:
pass
- @patch.object(grp, "getgrnam")
- @patch.object(pwd, "getpwnam")
- def test_attribute_group(self, getpwnam_mock, getgrnam_mock):
- def error(argument):
- self.assertEqual(argument, "test_group")
- raise KeyError("fail")
-
- getpwnam_mock.side_effect = 1
- getgrnam_mock.side_effect = error
- try:
- with Environment("/") as env:
- Execute('echo "1"',
- group="test_group",
- )
- except Fail as e:
- pass
-
@patch.object(subprocess, "Popen")
def test_attribute_environment(self, popen_mock):
expected_dict = {"JAVA_HOME": "/test/java/home"}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-agent/src/test/python/resource_management/TestFileResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestFileResource.py b/ambari-agent/src/test/python/resource_management/TestFileResource.py
index 4caa69c..43df94f 100644
--- a/ambari-agent/src/test/python/resource_management/TestFileResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestFileResource.py
@@ -21,6 +21,8 @@ from unittest import TestCase
from mock.mock import patch, MagicMock
import os
import sys
+import grp
+import pwd
from resource_management.core import Environment, Fail
from resource_management.core.resources import File
from resource_management.core.system import System
@@ -261,16 +263,16 @@ class TestFileResource(TestCase):
self.assertEqual(open_mock.call_count, 0)
- @patch("resource_management.core.providers.system._coerce_uid")
- @patch("resource_management.core.providers.system._coerce_gid")
+ @patch.object(pwd, "getpwnam")
+ @patch.object(grp, "getgrnam")
@patch.object(sudo, "chown")
@patch.object(sudo, "chmod")
@patch.object(sudo, "stat")
@patch.object(sudo, "create_file")
@patch.object(sudo, "path_exists")
@patch.object(sudo, "path_isdir")
- def test_ensure_metadata(self, isdir_mock, exists_mock, create_file_mock, stat_mock, chmod_mock, chown_mock, gid_mock,
- uid_mock):
+ def test_ensure_metadata(self, isdir_mock, exists_mock, create_file_mock, stat_mock, chmod_mock, chown_mock, getgrnam_mock,
+ getpwnam_mock):
"""
Tests if _ensure_metadata changes owner, usergroup and permissions of file to proper values
"""
@@ -284,8 +286,10 @@ class TestFileResource(TestCase):
self.st_gid = 1
stat_mock.return_value = stat()
- gid_mock.return_value = 0
- uid_mock.return_value = 0
+ getpwnam_mock.return_value = MagicMock()
+ getpwnam_mock.return_value.pw_uid = 0
+ getgrnam_mock.return_value = MagicMock()
+ getgrnam_mock.return_value.gr_gid = 0
with Environment('/') as env:
File('/directory/file',
@@ -301,14 +305,16 @@ class TestFileResource(TestCase):
self.assertEqual(create_file_mock.call_count, 1)
stat_mock.assert_called_with('/directory/file')
self.assertEqual(chmod_mock.call_count, 1)
- self.assertEqual(chown_mock.call_count, 2)
- gid_mock.assert_called_once_with('hdfs')
- uid_mock.assert_called_once_with('root')
+ self.assertEqual(chown_mock.call_count, 1)
+ getgrnam_mock.assert_called_once_with('hdfs')
+ getpwnam_mock.assert_called_with('root')
chmod_mock.reset_mock()
chown_mock.reset_mock()
- gid_mock.return_value = 1
- uid_mock.return_value = 1
+ getpwnam_mock.return_value = MagicMock()
+ getpwnam_mock.return_value.pw_uid = 1
+ getgrnam_mock.return_value = MagicMock()
+ getgrnam_mock.return_value.gr_gid = 1
with Environment('/') as env:
File('/directory/file',
@@ -321,7 +327,7 @@ class TestFileResource(TestCase):
self.assertEqual(chmod_mock.call_count, 1)
- self.assertEqual(chown_mock.call_count, 0)
+ chown_mock.assert_called_with('/directory/file', None, None)
@patch("resource_management.core.providers.system._ensure_metadata")
@patch("resource_management.core.providers.system.FileProvider._get_content")
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-agent/src/test/python/resource_management/TestGroupResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestGroupResource.py b/ambari-agent/src/test/python/resource_management/TestGroupResource.py
index d0ca261..65d8499 100644
--- a/ambari-agent/src/test/python/resource_management/TestGroupResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestGroupResource.py
@@ -62,7 +62,7 @@ class TestGroupResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getgrnam_mock.return_value = "mapred"
+ getgrnam_mock.return_value = _get_group()
with Environment('/') as env:
Group('mapred',
@@ -84,7 +84,7 @@ class TestGroupResource(TestCase):
subproc_mock.returncode = 1
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getgrnam_mock.return_value = "mapred"
+ getgrnam_mock.return_value = _get_group()
try:
with Environment('/') as env:
@@ -110,7 +110,7 @@ class TestGroupResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getgrnam_mock.return_value = "mapred"
+ getgrnam_mock.return_value = _get_group()
with Environment('/') as env:
Group('mapred',
@@ -119,7 +119,7 @@ class TestGroupResource(TestCase):
self.assertEqual(popen_mock.call_count, 1)
- popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'groupdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
+ popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'ambari-sudo.sh PATH=/bin -H -E groupdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
getgrnam_mock.assert_called_with('mapred')
@@ -131,7 +131,7 @@ class TestGroupResource(TestCase):
subproc_mock.returncode = 1
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getgrnam_mock.return_value = "mapred"
+ getgrnam_mock.return_value = _get_group()
try:
with Environment('/') as env:
@@ -144,5 +144,15 @@ class TestGroupResource(TestCase):
pass
self.assertEqual(popen_mock.call_count, 1)
- popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'groupdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
+ popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'ambari-sudo.sh PATH=/bin -H -E groupdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
getgrnam_mock.assert_called_with('mapred')
+
+def _get_group():
+ group = MagicMock()
+ group.gr_name='mapred'
+ group.gr_passwd='x'
+ group.gr_gid=0
+ group.gr_mem=[]
+
+ return group
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-agent/src/test/python/resource_management/TestUserResource.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/resource_management/TestUserResource.py b/ambari-agent/src/test/python/resource_management/TestUserResource.py
index 07b4e1e..5c8b6df 100644
--- a/ambari-agent/src/test/python/resource_management/TestUserResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestUserResource.py
@@ -46,7 +46,7 @@ class TestUserResource(TestCase):
popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', "ambari-sudo.sh PATH=/bin -H -E useradd -m -s /bin/bash mapred"], shell=False, preexec_fn=None, stderr=-2, stdout=5, env={'PATH': '/bin'}, bufsize=1, cwd=None, close_fds=True)
self.assertEqual(popen_mock.call_count, 1)
-
+
@patch.object(subprocess, "Popen")
@patch.object(pwd, "getpwnam")
def test_action_create_existent(self, getpwnam_mock, popen_mock):
@@ -54,7 +54,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", shell = "/bin/bash")
@@ -74,7 +74,7 @@ class TestUserResource(TestCase):
with Environment('/') as env:
user = User("mapred", action = "remove", shell = "/bin/bash")
- popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'userdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
+ popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'ambari-sudo.sh PATH=/bin -H -E userdel mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
self.assertEqual(popen_mock.call_count, 1)
@patch.object(subprocess, "Popen")
@@ -84,7 +84,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", comment = "testComment",
@@ -100,7 +100,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", home = "/test/home",
@@ -116,7 +116,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", password = "secure",
@@ -132,7 +132,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", shell = "/bin/sh")
@@ -147,7 +147,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", uid = "1", shell = "/bin/bash")
@@ -162,7 +162,7 @@ class TestUserResource(TestCase):
subproc_mock.returncode = 0
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", gid = "1", shell = "/bin/bash")
@@ -179,13 +179,13 @@ class TestUserResource(TestCase):
user_groups_mock.return_value = ['hadoop']
subproc_mock.stdout.readline = MagicMock(side_effect = ['OK'])
popen_mock.return_value = subproc_mock
- getpwnam_mock.return_value = 1
+ getpwnam_mock.return_value = _get_user_entity()
with Environment('/') as env:
user = User("mapred", action = "create", groups = ['1','2','3'],
shell = "/bin/bash")
- popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'ambari-sudo.sh PATH=/bin -H -E usermod -G 1,2,3,hadoop -s /bin/bash mapred'], shell=False, preexec_fn=None, env={'PATH': '/bin'}, close_fds=True, stdout=5, stderr=-2, bufsize=1, cwd=None)
+ popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', 'ambari-sudo.sh PATH=/bin -H -E usermod -s /bin/bash -G 1,2,3,hadoop mapred'], shell=False, preexec_fn=None, env={'PATH': '/bin'}, close_fds=True, stdout=5, stderr=-2, bufsize=1, cwd=None)
self.assertEqual(popen_mock.call_count, 1)
@patch.object(subprocess, "Popen")
@@ -202,3 +202,14 @@ class TestUserResource(TestCase):
popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', '-c', "ambari-sudo.sh PATH=/bin -H -E useradd -m mapred"], shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': '/bin'}, cwd=None, close_fds=True)
self.assertEqual(popen_mock.call_count, 1)
+def _get_user_entity():
+ user = MagicMock()
+ user.pw_name='mapred'
+ user.pw_passwd='x'
+ user.pw_uid=0
+ user.pw_gid=0
+ user.pw_gecos='root'
+ user.pw_dir='/root'
+ user.pw_shell='/bin/false'
+
+ return user
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-common/src/main/python/resource_management/core/providers/accounts.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/accounts.py b/ambari-common/src/main/python/resource_management/core/providers/accounts.py
index d14ae34..e7ef399 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/accounts.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/accounts.py
@@ -30,38 +30,48 @@ from resource_management.core.logger import Logger
class UserProvider(Provider):
+ options = dict(
+ comment=(lambda self: self.user.pw_gecos, "-c"),
+ gid=(lambda self: grp.getgrgid(self.user.pw_gid).gr_name, "-g"),
+ uid=(lambda self: self.user.pw_uid, "-u"),
+ shell=(lambda self: self.user.pw_shell, "-s"),
+ password=(lambda self: self.user.pw_password, "-p"),
+ home=(lambda self: self.user.pw_dir, "-d"),
+ groups=(lambda self: self.user_groups, "-G")
+ )
+
def action_create(self):
if not self.user:
command = ['useradd', "-m"]
Logger.info("Adding user %s" % self.resource)
else:
command = ['usermod']
+
+ for option_name, attributes in self.options.iteritems():
+ if getattr(self.resource, option_name) != None and getattr(self.resource, option_name) != attributes[0](self):
+ # groups on system contain the one we need
+ if attributes[1] == "-G" and set(getattr(self.resource, option_name)).issubset(set(attributes[0](self))):
+ continue
+ break
+ else:
+ return
+
Logger.info("Modifying user %s" % (self.resource.username))
- options = dict(
- comment="-c",
- gid="-g",
- uid="-u",
- shell="-s",
- password="-p",
- home="-d",
- )
-
if self.resource.system and not self.user:
command.append("--system")
-
- if self.resource.groups:
-
- groups = self.resource.groups
- if self.user and self.user_groups:
- groups += self.user_groups
- command += ["-G", ",".join(groups)]
-
- for option_name, option_flag in options.items():
- option_value = getattr(self.resource, option_name)
- if option_flag and option_value:
- command += [option_flag, str(option_value)]
+ for option_name, attributes in self.options.iteritems():
+ if attributes[1] == "-G":
+ groups = self.resource.groups
+ if self.user and self.user_groups:
+ groups += self.user_groups
+ option_value = ",".join(groups)
+ else:
+ option_value = getattr(self.resource, option_name)
+
+ if attributes[1] and option_value:
+ command += [attributes[1], str(option_value)]
# if trying to modify existing user, but no values to modify are provided
if self.user and len(command) == 1:
@@ -74,7 +84,7 @@ class UserProvider(Provider):
def action_remove(self):
if self.user:
command = ['userdel', self.resource.username]
- shell.checked_call(command)
+ shell.checked_call(command, sudo=True)
Logger.info("Removed user %s" % self.resource)
@property
@@ -89,6 +99,10 @@ class UserProvider(Provider):
return [g.gr_name for g in grp.getgrall() if self.resource.username in g.gr_mem]
class GroupProvider(Provider):
+ options = dict(
+ gid=(lambda self: self.group.gr_gid, "-g"),
+ password=(lambda self: self.group.gr_passwd, "-p")
+ )
def action_create(self):
group = self.group
if not group:
@@ -96,28 +110,32 @@ class GroupProvider(Provider):
Logger.info("Adding group %s" % self.resource)
else:
command = ['groupmod']
- Logger.info("Modifying group %s" % (self.resource.group_name))
- options = dict(
- gid="-g",
- password="-p",
- )
+ for option_name, attributes in self.options.iteritems():
+ if getattr(self.resource, option_name) != None and getattr(self.resource, option_name) != attributes[0](self):
+ break
+ else:
+ return
+
+ Logger.info("Modifying group %s" % (self.resource.group_name))
- for option_name, option_flag in options.items():
+ for option_name, attributes in self.options.iteritems():
option_value = getattr(self.resource, option_name)
- if option_flag and option_value:
- command += [option_flag, str(option_value)]
+ if attributes[1] and option_value:
+ command += [attributes[1], str(option_value)]
command.append(self.resource.group_name)
+ # if trying to modify existing group, but no values to modify are provided
+ if self.group and len(command) == 1:
+ return
+
shell.checked_call(command, sudo=True)
- group = self.group
-
def action_remove(self):
if self.group:
command = ['groupdel', self.resource.group_name]
- shell.checked_call(command)
+ shell.checked_call(command, sudo=True)
Logger.info("Removed group %s" % self.resource)
@property
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-common/src/main/python/resource_management/core/providers/system.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/system.py b/ambari-common/src/main/python/resource_management/core/providers/system.py
index 07155f5..ba64e5d 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -25,32 +25,34 @@ from __future__ import with_statement
import re
import os
import time
+import pwd
+import grp
from resource_management.core import shell
from resource_management.core import sudo
from resource_management.core.base import Fail
from resource_management.core import ExecuteTimeoutException
from resource_management.core.providers import Provider
from resource_management.core.logger import Logger
-from resource_management.core.utils import _coerce_uid
-from resource_management.core.utils import _coerce_gid
def _ensure_metadata(path, user, group, mode=None, cd_access=None):
stat = sudo.stat(path)
-
+ user_entity = group_entity = None
+
if user:
- uid = _coerce_uid(user)
- if stat.st_uid != uid:
+ _user_entity = pwd.getpwnam(user)
+ if stat.st_uid != _user_entity.pw_uid:
+ user_entity = _user_entity
Logger.info(
"Changing owner for %s from %d to %s" % (path, stat.st_uid, user))
- sudo.chown(path, user, None)
-
if group:
- gid = _coerce_gid(group)
- if stat.st_gid != gid:
+ _group_entity = grp.getgrnam(group)
+ if stat.st_gid != _group_entity.gr_gid:
+ group_entity = _group_entity
Logger.info(
"Changing group for %s from %d to %s" % (path, stat.st_gid, group))
- sudo.chown(path, None, group)
+
+ sudo.chown(path, user_entity, group_entity)
if mode:
if stat.st_mode != mode:
@@ -214,7 +216,7 @@ class LinkProvider(Provider):
def _preexec_fn(resource):
def preexec():
if resource.group:
- gid = _coerce_gid(resource.group)
+ gid = grp.getgrnam(resource.group).gr_gid
os.setgid(gid)
os.setegid(gid)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-common/src/main/python/resource_management/core/sudo.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/sudo.py b/ambari-common/src/main/python/resource_management/core/sudo.py
index e7bb08a..ebde23d 100644
--- a/ambari-common/src/main/python/resource_management/core/sudo.py
+++ b/ambari-common/src/main/python/resource_management/core/sudo.py
@@ -25,13 +25,14 @@ import shutil
import stat
from resource_management.core import shell
from resource_management.core.logger import Logger
-from resource_management.core.utils import _coerce_uid
-from resource_management.core.utils import _coerce_gid
from ambari_commons.os_check import OSCheck
if os.geteuid() == 0:
def chown(path, owner, group):
- return os.chown(path, _coerce_uid(owner) if owner else -1, _coerce_gid(group) if group else -1)
+ uid = owner.pw_uid if owner else -1
+ gid = group.gr_gid if group else -1
+ if uid != -1 or gid != 1:
+ return os.chown(path, uid, gid)
def chmod(path, mode):
return os.chmod(path, mode)
@@ -101,10 +102,10 @@ else:
# os.chown replacement
def chown(path, owner, group):
- if owner:
- shell.checked_call(["chown", owner, path], sudo=True)
- if group:
- shell.checked_call(["chgrp", group, path], sudo=True)
+ owner = owner.pw_name if owner else ""
+ group = group.gr_name if group else ""
+ if owner or group:
+ shell.checked_call(["chown", owner+":"+group, path], sudo=True)
# os.chmod replacement
def chmod(path, mode):
http://git-wip-us.apache.org/repos/asf/ambari/blob/3761bda7/ambari-common/src/main/python/resource_management/core/utils.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/utils.py b/ambari-common/src/main/python/resource_management/core/utils.py
index cc8b404..52a12b3 100644
--- a/ambari-common/src/main/python/resource_management/core/utils.py
+++ b/ambari-common/src/main/python/resource_management/core/utils.py
@@ -106,28 +106,3 @@ def checked_unite(dict1, dict2):
result.update(dict2)
return result
-
-def _coerce_uid(user):
- import pwd
-
- try:
- uid = int(user)
- except ValueError:
- try:
- uid = pwd.getpwnam(user).pw_uid
- except KeyError:
- raise Fail("User %s doesn't exist." % user)
- return uid
-
-
-def _coerce_gid(group):
- import grp
-
- try:
- gid = int(group)
- except ValueError:
- try:
- gid = grp.getgrnam(group).gr_gid
- except KeyError:
- raise Fail("Group %s doesn't exist." % group)
- return gid