You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rk...@apache.org on 2017/01/10 16:27:18 UTC
ambari git commit: AMBARI-19316 Zeppelin stop failed during EU while
deleting pid file with customized service user (r-kamath)
Repository: ambari
Updated Branches:
refs/heads/trunk f5c573a36 -> 0b6b67024
AMBARI-19316 Zeppelin stop failed during EU while deleting pid file with customized service user (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b6b6702
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b6b6702
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b6b6702
Branch: refs/heads/trunk
Commit: 0b6b67024212dd559cd646b51e1cab27300e74d4
Parents: f5c573a
Author: Renjith Kamath <re...@gmail.com>
Authored: Tue Jan 10 21:56:17 2017 +0530
Committer: Renjith Kamath <re...@gmail.com>
Committed: Tue Jan 10 21:56:17 2017 +0530
----------------------------------------------------------------------
.../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 8 ++++++++
.../python/stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 10 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6b6702/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 04089ce..d3d494d 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
@@ -104,12 +104,19 @@ class Master(Script):
mode=0755
)
+ def chown_zeppelin_pid_dir(self, env):
+ import params
+ env.set_params(params)
+ Execute(("chown", "-R", format("{zeppelin_user}") + ":" + format("{zeppelin_group}"), params.zeppelin_pid_dir),
+ sudo=True)
+
def configure(self, env):
import params
import status_params
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],
@@ -154,6 +161,7 @@ class Master(Script):
def stop(self, env, upgrade_type=None):
import params
self.create_zeppelin_log_dir(env)
+ self.chown_zeppelin_pid_dir(env)
Execute(params.zeppelin_dir + '/bin/zeppelin-daemon.sh stop >> ' + params.zeppelin_log_file,
user=params.zeppelin_user)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6b6702/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 aea4ba8..9a3555b 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,6 +39,7 @@ 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,
@@ -79,7 +80,7 @@ class TestZeppelinMaster(RMFTestCase):
content = StaticFile('/etc/spark/conf/hive-site.xml'),
group = 'zeppelin',
)
-
+
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/var/log/zeppelin',
owner = 'zeppelin',
@@ -88,6 +89,7 @@ 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,
@@ -166,6 +168,9 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
+ self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'),
+ sudo = True,
+ )
self.assertResourceCalled('Execute', '/usr/hdp/current/zeppelin-server/bin/zeppelin-daemon.sh stop >> /var/log/zeppelin/zeppelin-setup.log',
user = 'zeppelin',
)
@@ -186,6 +191,9 @@ class TestZeppelinMaster(RMFTestCase):
mode = 0755,
cd_access = 'a',
)
+ self.assertResourceCalled('Execute', ('chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'),
+ sudo = True,
+ )
self.assertResourceCalled('Execute', '/usr/hdp/current/zeppelin-server/bin/zeppelin-daemon.sh stop >> /var/log/zeppelin/zeppelin-setup.log',
user = 'zeppelin',
)