You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/09/19 20:06:58 UTC

git commit: AMBARI-7414. ATS shows stopped after upgrade 1.6.1 -> 1.7.0.(vbrodetskyi)

Repository: ambari
Updated Branches:
  refs/heads/trunk d99a275f5 -> fbe97db79


AMBARI-7414. ATS shows stopped after upgrade 1.6.1 -> 1.7.0.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbe97db7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbe97db7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbe97db7

Branch: refs/heads/trunk
Commit: fbe97db797a276a490b9aeba752a22df3e5a8f07
Parents: d99a275
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Sep 19 21:01:24 2014 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Sep 19 21:01:24 2014 +0300

----------------------------------------------------------------------
 .../services/YARN/package/scripts/application_timeline_server.py   | 2 ++
 .../HDP/2.0.6/services/YARN/package/scripts/status_params.py       | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fbe97db7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py
index 85d97c2..b38c147 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/application_timeline_server.py
@@ -49,6 +49,8 @@ class ApplicationTimelineServer(Script):
   def status(self, env):
     import status_params
     env.set_params(status_params)
+    Execute(format("mv {yarn_historyserver_pid_file_old} {yarn_historyserver_pid_file}"),
+            only_if = format("test -e {yarn_historyserver_pid_file_old}", user=status_params.yarn_user))
     check_process_status(status_params.yarn_historyserver_pid_file)
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/fbe97db7/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/status_params.py
index 6bc977c..498a885 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/status_params.py
@@ -31,5 +31,6 @@ mapred_pid_dir = format("{mapred_pid_dir_prefix}/{mapred_user}")
 
 resourcemanager_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-resourcemanager.pid")
 nodemanager_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-nodemanager.pid")
+yarn_historyserver_pid_file_old = format("{yarn_pid_dir}/yarn-{yarn_user}-historyserver.pid")
 yarn_historyserver_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-timelineserver.pid")  # *-historyserver.pid is deprecated
 mapred_historyserver_pid_file = format("{mapred_pid_dir}/mapred-{mapred_user}-historyserver.pid")
\ No newline at end of file