You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/01/15 23:08:23 UTC
ambari git commit: AMBARI-19442. Ownership is changed before the
creation of directory in ZEPPELIN master.py (Renjith Kamath via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 0a570c671 -> ad574af9c
AMBARI-19442. Ownership is changed before the creation of directory in ZEPPELIN master.py (Renjith Kamath via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad574af9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad574af9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad574af9
Branch: refs/heads/trunk
Commit: ad574af9ca44d1760f0d45b25a98173c84dd4de4
Parents: 0a570c6
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun Jan 15 15:06:29 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun Jan 15 15:06:29 2017 -0800
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 2 +-
.../src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad574af9/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index d3d494d..ac56aa2 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -116,7 +116,6 @@ class Master(Script):
env.set_params(params)
env.set_params(status_params)
self.create_zeppelin_log_dir(env)
- self.chown_zeppelin_pid_dir(env)
# create the pid and zeppelin dirs
Directory([params.zeppelin_pid_dir, params.zeppelin_dir],
@@ -126,6 +125,7 @@ class Master(Script):
create_parents=True,
mode=0755
)
+ self.chown_zeppelin_pid_dir(env)
# write out zeppelin-site.xml
XmlConfig("zeppelin-site.xml",
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad574af9/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py
index d046dcd..2578316 100644
--- a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py
+++ b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py
@@ -39,7 +39,6 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo = True)
self.assertResourceCalled('Directory', '/var/run/zeppelin',
owner = 'zeppelin',
create_parents = True,
@@ -54,6 +53,7 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
+ self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo = True)
self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml',
owner = 'zeppelin',
group = 'zeppelin',
@@ -89,7 +89,6 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo = True)
self.assertResourceCalled('Directory', '/var/run/zeppelin',
owner = 'zeppelin',
create_parents = True,
@@ -104,6 +103,7 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
+ self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo = True)
self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml',
owner = 'zeppelin',
group = 'zeppelin',