Repository: ambari
Updated Branches:
refs/heads/trunk 3b6003229 -> 79588cedb
AMBARI-18235. Atlas file permissions of
/var/lib/ambari-agent/tmp/atlas_hbase_setup.rb need to be
${hbase_user}:${hadoop_group} (vbrodetskyi and tested by alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/79588ced
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79588ced
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79588ced
Branch: refs/heads/trunk
Commit: 79588cedb46e794158b1b2516477c12d3701c785
Parents: 3b60032
Author: Alejandro Fernandez <[email protected]>
Authored: Mon Aug 22 15:34:24 2016 -0700
Committer: Alejandro Fernandez <[email protected]>
Committed: Mon Aug 22 15:34:27 2016 -0700
----------------------------------------------------------------------
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 ++
.../src/test/python/stacks/2.3/ATLAS/test_metadata_server.py | 6 ++++++
ambari-server/src/test/python/stacks/2.3/configs/default.json | 3 +++
ambari-server/src/test/python/stacks/2.3/configs/secure.json | 3 +++
.../src/test/python/stacks/2.5/ATLAS/test_atlas_server.py | 2 ++
ambari-server/src/test/python/stacks/2.5/configs/default.json | 3 +++
6 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
----------------------------------------------------------------------
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index a195fd3..6ec636c 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -123,6 +123,8 @@ def metadata(type='server'):
create_collection('fulltext_index', 'atlas_configs', jaasFile)
File(params.atlas_hbase_setup,
+ group=params.user_group,
+ owner=params.hbase_user,
content=Template("atlas_hbase_setup.rb.j2")
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
----------------------------------------------------------------------
diff --git
a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index f6886ee..585dc94 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -322,6 +322,8 @@ class TestMetadataServer(RMFTestCase):
self.configureResourcesCalled()
self.assertResourceCalled('File', '/tmp/atlas_hbase_setup.rb',
+ owner = "hbase",
+ group = "hadoop",
content=Template("atlas_hbase_setup.rb.j2"))
self.assertNoMoreResources()
@@ -338,6 +340,8 @@ class TestMetadataServer(RMFTestCase):
self.configureResourcesCalledSecure()
self.assertResourceCalled('File', '/tmp/atlas_hbase_setup.rb',
+ owner = "hbase",
+ group = "hadoop",
content=Template("atlas_hbase_setup.rb.j2"))
self.assertNoMoreResources()
@@ -353,6 +357,8 @@ class TestMetadataServer(RMFTestCase):
self.configureResourcesCalled()
self.assertResourceCalled('File', '/tmp/atlas_hbase_setup.rb',
+ owner = "hbase",
+ group = "hadoop",
content=Template("atlas_hbase_setup.rb.j2"))
self.assertResourceCalled('Execute', 'source /etc/atlas/conf/atlas-env.sh
; /usr/hdp/current/atlas-server/bin/atlas_start.py',
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/test/python/stacks/2.3/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json
b/ambari-server/src/test/python/stacks/2.3/configs/default.json
index 9666c31..a50708f 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json
@@ -46,6 +46,9 @@
"yarn-env": {
"yarn_user": "yarn"
},
+ "hbase-env": {
+ "hbase_user": "hbase"
+ },
"mahout-log4j": {
"content": "\n #\n #\n # Licensed
to the Apache Software Foundation (ASF) under one\n # or more
contributor license agreements. See the NOTICE file\n # distributed
with this work for additional information\n # regarding copyright
ownership. The ASF licenses this file\n # to you under the Apache
License, Version 2.0 (the\n # \"License\"); you may not use this
file except in compliance\n # with the License. You may obtain a
copy of the License at\n #\n #
http://www.apache.org/licenses/LICENSE-2.0\n #\n # Unless
required by applicable law or agreed to in writing,\n # software
distributed under the License is distributed on an\n # \"AS IS\"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n # KIND, either
express or implied. See the License for the\n # specific language
governing permiss
ions and limitations\n # under the License.\n #\n
#\n #\n\n # Set everything to be logged to the
console\n log4j.rootCategory=WARN, console\n
log4j.appender.console=org.apache.log4j.ConsoleAppender\n
log4j.appender.console.target=System.err\n
log4j.appender.console.layout=org.apache.log4j.PatternLayout\n
log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}:
%m%n\n\n # Settings to quiet third party logs that are too verbose\n
log4j.logger.org.eclipse.jetty=WARN\n
log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=WARN\n
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=WARN"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/test/python/stacks/2.3/configs/secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/secure.json
b/ambari-server/src/test/python/stacks/2.3/configs/secure.json
index fe4ca92..4501b81 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/secure.json
@@ -36,6 +36,9 @@
"mahout-env": {
"mahout_user": "mahout"
},
+ "hbase-env": {
+ "hbase_user": "hbase"
+ },
"mahout-log4j": {
"content": "\n #\n #\n # Licensed to
the Apache Software Foundation (ASF) under one\n # or more
contributor license agreements. See the NOTICE file\n # distributed
with this work for additional information\n # regarding copyright
ownership. The ASF licenses this file\n # to you under the Apache
License, Version 2.0 (the\n # \"License\"); you may not use this
file except in compliance\n # with the License. You may obtain a
copy of the License at\n #\n #
http://www.apache.org/licenses/LICENSE-2.0\n #\n # Unless
required by applicable law or agreed to in writing,\n # software
distributed under the License is distributed on an\n # \"AS IS\"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n # KIND, either
express or implied. See the License for the\n # specific language
governing permissions a
nd limitations\n # under the License.\n #\n
#\n #\n\n # Set everything to be logged to the console\n
log4j.rootCategory=WARN, console\n
log4j.appender.console=org.apache.log4j.ConsoleAppender\n
log4j.appender.console.target=System.err\n
log4j.appender.console.layout=org.apache.log4j.PatternLayout\n
log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}:
%m%n\n\n # Settings to quiet third party logs that are too verbose\n
log4j.logger.org.eclipse.jetty=WARN\n
log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=WARN\n
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=WARN"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
----------------------------------------------------------------------
diff --git
a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
index 8e84d2a..584763d 100644
--- a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
@@ -178,6 +178,8 @@ class TestAtlasServer(RMFTestCase):
self.configureResourcesCalled()
self.assertResourceCalled('File', '/tmp/atlas_hbase_setup.rb',
+ owner = "hbase",
+ group = "hadoop",
content=Template("atlas_hbase_setup.rb.j2"))
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/79588ced/ambari-server/src/test/python/stacks/2.5/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/default.json
b/ambari-server/src/test/python/stacks/2.5/configs/default.json
index 804be95..a7b2de2 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/default.json
@@ -43,6 +43,9 @@
"mahout-env": {
"mahout_user": "mahout"
},
+ "hbase-env": {
+ "hbase_user": "hbase"
+ },
"yarn-env": {
"yarn_user": "yarn"
},
