Repository: ambari Updated Branches: refs/heads/trunk 8452f207d -> 81af756ad
AMBARI-11123. Check Mahout fails on devdeploy test run after enabling security (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/81af756a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81af756a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81af756a Branch: refs/heads/trunk Commit: 81af756ada66bd65b05b6e3443c2936a3ab8f9fb Parents: 8452f20 Author: Andrew Onishuk <[email protected]> Authored: Thu May 14 12:22:19 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Thu May 14 12:22:19 2015 +0300 ---------------------------------------------------------------------- .../MAHOUT/1.0.0.2.3/package/scripts/service_check.py | 4 ++++ .../python/stacks/2.3/MAHOUT/test_mahout_service_check.py | 10 ++++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/81af756a/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 da93c35..b7398d4 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 @@ -35,6 +35,10 @@ class MahoutServiceCheck(Script): mode = 0755 ) + params.HdfsResource(format("/user/{smokeuser}/mahoutsmokeoutput"), + action="delete_on_execute", + type="directory", + ) params.HdfsResource(format("/user/{smokeuser}/mahoutsmokeinput"), action="create_on_execute", type="directory", http://git-wip-us.apache.org/repos/asf/ambari/blob/81af756a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py index 665119f..65b04f7 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_service_check.py @@ -37,6 +37,16 @@ class TestMahoutClient(RMFTestCase): content = 'Test text which will be converted to sequence file.', mode = 0755, ) + self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mahoutsmokeoutput', + security_enabled = False, + hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', + keytab = UnknownConfigurationMock(), + kinit_path_local = '/usr/bin/kinit', + user = 'hdfs', + action = ['delete_on_execute'], + hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', + type = 'directory', + ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mahoutsmokeinput', security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
