Repository: ambari Updated Branches: refs/heads/branch-2.4 1feda4343 -> 9703f2408
AMBARI-16883. [Zeppelin] Restart service button not available after the configuration update & intermittent restart failure (Renjith Kamath via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9703f240 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9703f240 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9703f240 Branch: refs/heads/branch-2.4 Commit: 9703f24087023fab8b308232cf550789b5ebb94e Parents: 1feda43 Author: Pallav Kulshreshtha <[email protected]> Authored: Thu May 26 21:43:19 2016 +0530 Committer: Pallav Kulshreshtha <[email protected]> Committed: Thu May 26 21:45:10 2016 +0530 ---------------------------------------------------------------------- .../resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml | 3 ++- .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9703f240/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml index 0e10596..f609156 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/metainfo.xml @@ -63,8 +63,9 @@ limitations under the License. <configuration-dependencies> <config-type>zeppelin-config</config-type> + <config-type>zeppelin-env</config-type> </configuration-dependencies> - <restartRequiredAfterChange>false</restartRequiredAfterChange> + <restartRequiredAfterChange>true</restartRequiredAfterChange> <quickLinksConfigurations> <quickLinksConfiguration> http://git-wip-us.apache.org/repos/asf/ambari/blob/9703f240/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 7d365ec..9cd1b1d 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 @@ -184,8 +184,11 @@ class Master(Script): import status_params env.set_params(status_params) - pid_file = glob.glob(status_params.zeppelin_pid_dir + '/zeppelin-' - + status_params.zeppelin_user + '*.pid')[0] + try: + pid_file = glob.glob(status_params.zeppelin_pid_dir + '/zeppelin-' + + status_params.zeppelin_user + '*.pid')[0] + except IndexError: + pid_file = '' check_process_status(pid_file) def update_zeppelin_interpreter(self):
