You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/09/17 18:12:24 UTC
ambari git commit: AMBARI-12433. Mahout Service Check failing after
enabling Kerberos.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 4d0638295 -> 3d48156e6
AMBARI-12433. Mahout Service Check failing after enabling Kerberos.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d48156e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d48156e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d48156e
Branch: refs/heads/branch-2.1
Commit: 3d48156e629e799688c78409e8011ab3f6ab853f
Parents: 4d06382
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Sep 17 19:11:58 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Sep 17 19:11:58 2015 +0300
----------------------------------------------------------------------
.../MAHOUT/1.0.0.2.3/kerberos.json | 20 ++++++++++++++++++++
.../MAHOUT/1.0.0.2.3/metainfo.xml | 1 +
.../MAHOUT/1.0.0.2.3/package/scripts/mahout.py | 9 +++++++++
.../MAHOUT/1.0.0.2.3/package/scripts/params.py | 1 +
.../1.0.0.2.3/package/scripts/service_check.py | 7 ++++++-
.../stacks/2.3/MAHOUT/test_mahout_client.py | 9 +++++++++
.../test/python/stacks/2.3/configs/default.json | 3 +++
7 files changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/kerberos.json b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/kerberos.json
new file mode 100644
index 0000000..91fff4a
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/kerberos.json
@@ -0,0 +1,20 @@
+{
+ "services": [
+ {
+ "name": "MAHOUT",
+ "identities": [
+ {
+ "name": "/smokeuser"
+ },
+ {
+ "name": "/HDFS/hdfs"
+ }
+ ],
+ "components": [
+ {
+ "name": "MAHOUT"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml
index d41460a..bd8ef70 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml
@@ -70,6 +70,7 @@
</requiredServices>
<configuration-dependencies>
+ <config-type>yarn-site</config-type>
<config-type>mahout-log4j</config-type>
</configuration-dependencies>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
index c9d2915..0fa937b 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
@@ -31,6 +31,15 @@ def mahout():
group = params.user_group
)
+ XmlConfig("yarn-site.xml",
+ conf_dir=params.hadoop_conf_dir,
+ configurations=params.config['configurations']['yarn-site'],
+ configuration_attributes=params.config['configuration_attributes']['yarn-site'],
+ owner=params.yarn_user,
+ group=params.user_group,
+ mode=0644
+ )
+
if not is_empty(params.log4j_props):
File(format("{params.mahout_conf_dir}/log4j.properties"),
mode=0644,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
index e432c36..218f9cf 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
@@ -54,6 +54,7 @@ hadoop_home = hdp_select.get_hadoop_dir("home")
hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
+yarn_user = config['configurations']['yarn-env']['yarn_user']
hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
smokeuser = config['configurations']['cluster-env']['smokeuser']
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/service_check.py
index b7398d4..11a85e1 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/service_check.py
@@ -51,7 +51,12 @@ class MahoutServiceCheck(Script):
source=format("{tmp_dir}/sample-mahout-test.txt")
)
params.HdfsResource(None, action="execute")
-
+
+ if params.security_enabled:
+ kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal};")
+ Execute(kinit_cmd,
+ user=params.smokeuser)
+
Execute( mahout_command,
tries = 3,
try_sleep = 5,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py
index d2e886c..4776859 100644
--- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py
+++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py
@@ -41,6 +41,15 @@ class TestMahoutClient(RMFTestCase):
group = 'hadoop',
recursive = True)
+ self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
+ owner = "yarn",
+ group = 'hadoop',
+ mode = 0644,
+ conf_dir = '/usr/hdp/current/hadoop-client/conf',
+ configurations = self.getConfig()['configurations']['yarn-site'],
+ configuration_attributes = self.getConfig()['configuration_attributes']['yarn-site']
+ )
+
self.assertResourceCalled('File',
'/usr/hdp/current/mahout-client/conf/log4j.properties',
content = self.getConfig()['configurations']['mahout-log4j']['content'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d48156e/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 d78f517..21bff13 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
@@ -36,6 +36,9 @@
"mahout-env": {
"mahout_user": "mahout"
},
+ "yarn-env": {
+ "yarn_user": "yarn"
+ },
"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"
},