Repository: ambari Updated Branches: refs/heads/trunk 5e72ee6f2 -> 3ce361049
Revert "AMBARI-19316 Zeppelin stop failed during EU while deleting pid file with customized service user (r-kamath)" This reverts commit 25a596769c7c420dc28e3a7178bf7f02dca5880f due to unit test failures Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ce36104 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ce36104 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ce36104 Branch: refs/heads/trunk Commit: 3ce361049520098d9df9ec6aef8748aa1120cad3 Parents: 5e72ee6 Author: Yusaku Sako <[email protected]> Authored: Thu Jan 5 11:03:10 2017 -0800 Committer: Yusaku Sako <[email protected]> Committed: Thu Jan 5 11:03:10 2017 -0800 ---------------------------------------------------------------------- .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3ce36104/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..04089ce 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,19 +104,12 @@ 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], @@ -161,7 +154,6 @@ 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)
