Repository: ambari Updated Branches: refs/heads/trunk 4ca2ba7a3 -> 5d2466791
AMBARI-11646 Need option to not override local uid (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d246679 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d246679 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d246679 Branch: refs/heads/trunk Commit: 5d24667912731399e86d2898089509f4df39a97f Parents: 4ca2ba7 Author: Dmytro Sen <[email protected]> Authored: Wed Jun 3 15:23:03 2015 +0300 Committer: Dmytro Sen <[email protected]> Committed: Wed Jun 3 15:23:03 2015 +0300 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 7 +++++++ .../HDP/2.0.6/hooks/before-ANY/scripts/params.py | 1 + .../hooks/before-ANY/scripts/shared_initialization.py | 4 ++-- .../src/test/python/stacks/2.0.6/configs/default.json | 3 ++- ambari-web/app/data/HDP2/site_properties.js | 14 +++++++++++++- ambari-web/app/utils/config.js | 8 +++++--- 6 files changed, 30 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 436d7da..213b95f 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -152,4 +152,11 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_ </value> </property> + <property> + <name>override_hbase_uid</name> + <value>true</value> + <property-type>ADDITIONAL_USER_PROPERTY</property-type> + <description>Have Ambari manage UIDs</description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index 1f78d71..4f67f07 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -195,3 +195,4 @@ group_list = json.loads(config['hostLevelParams']['group_list']) host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False) tez_am_view_acls = config['configurations']['tez-site']["tez.am.view-acls"] +override_hbase_uid = config['configurations']['hbase-env']["override_hbase_uid"] http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py index 1e2df32..699fe5f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py @@ -89,7 +89,7 @@ def setup_users(): recursive = True, cd_access="a", ) - if not params.host_sys_prepped: + if not params.host_sys_prepped and params.override_hbase_uid: set_uid(params.hbase_user, params.hbase_user_dirs) else: print 'Skipping setting uid for hbase user as host is sys prepped' @@ -185,4 +185,4 @@ def setup_hadoop_env(): if os.path.exists(params.hadoop_conf_dir): File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'), owner=tc_owner, group=params.user_group, - content=InlineTemplate(params.hadoop_env_sh_template)) \ No newline at end of file + content=InlineTemplate(params.hadoop_env_sh_template)) http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 510ccda..2c09011 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -544,7 +544,8 @@ "hbase_regionserver_heapsize": "1024m", "hbase_regionserver_xmn_max": "512", "hbase_regionserver_xmn_ratio": "0.2", - "hbase_log_dir": "/var/log/hbase" + "hbase_log_dir": "/var/log/hbase", + "override_hbase_uid" : "true" }, "ganglia-env": { "gmond_user": "nobody", http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/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 d5310e2..cb97825 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -4467,6 +4467,17 @@ var hdp2properties = [ }, { "id": "puppet var", + "name": "override_hbase_uid", + "displayName": "Have Ambari manage UIDs", + "displayType": "checkbox", + "isReconfigurable": true, + "isOverridable": false, + "isVisible": true, + "filename": "hbase-env.xml", + "category": "Users and Groups" + }, + { + "id": "puppet var", "name": "create_notification", "displayName": "Create Notification", "isRequired": true, @@ -5079,7 +5090,8 @@ if (App.get('isHadoopWindowsStack')) { 'knox_pid_dir', 'ignore_groupsusers_create', 'hive_database', - 'oozie_database' + 'oozie_database', + 'override_hbase_uid' ]; hdp2properties = hdp2properties.filter(function (item) { http://git-wip-us.apache.org/repos/asf/ambari/blob/5d246679/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 8e11193..551dfa0 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -1059,8 +1059,10 @@ App.config = Em.Object.create({ 'user_group': 'Hadoop Group', 'mapred_user': 'MapReduce User', 'zk_user': 'ZooKeeper User', - 'ignore_groupsusers_create': 'Skip group modifications during install' + 'ignore_groupsusers_create': 'Skip group modifications during install', + 'override_hbase_uid': 'Have Ambari manage UIDs' }; + var checkboxProperties = ['ignore_groupsusers_create', 'override_hbase_uid']; if (Em.isArray(config.property_type)) { if (config.property_type.contains('USER') || config.property_type.contains('ADDITIONAL_USER_PROPERTY') || config.property_type.contains('GROUP')) { propertyData.id = "puppet var"; @@ -1070,8 +1072,8 @@ App.config = Em.Object.create({ propertyData.isOverridable = false; propertyData.isReconfigurable = false; propertyData.displayName = nameToDisplayNameMap[config.property_name] || App.format.normalizeName(config.property_name); - propertyData.displayType = config.property_name == 'ignore_groupsusers_create' ? 'checkbox' : 'user'; - if (config.service_name) { + propertyData.displayType = checkboxProperties.contains(config.property_name) ? 'checkbox' : 'user'; + if (config.service_name && !config.property_type.contains('ADDITIONAL_USER_PROPERTY')) { var propertyIndex = config.service_name == 'MISC' ? 30 : App.StackService.find().mapProperty('serviceName').indexOf(config.service_name); propertyData.belongsToService = [config.service_name]; propertyData.index = propertyIndex;
