You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/08/31 09:53:46 UTC
oozie git commit: OOZIE-3155 [ui] Job DAG is not refreshed when a job
is finished (asalamon74 via andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master 9d406cee7 -> 9735dd38c
OOZIE-3155 [ui] Job DAG is not refreshed when a job is finished (asalamon74 via andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9735dd38
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9735dd38
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9735dd38
Branch: refs/heads/master
Commit: 9735dd38c4f4081e8869624848f8e1162ab7aa6e
Parents: 9d406ce
Author: Andras Piros <an...@cloudera.com>
Authored: Fri Aug 31 11:52:58 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Fri Aug 31 11:52:58 2018 +0200
----------------------------------------------------------------------
release-log.txt | 1 +
webapp/src/main/webapp/oozie-console.js | 36 ++++++++++++++++------------
2 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/9735dd38/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 35608d5..ce945b4 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3155 [ui] Job DAG is not refreshed when a job is finished (asalamon74 via andras.piros)
OOZIE-3334 Don't use org.apache.hadoop.hbase.security.User in HDFSCredentials (gezapeti)
OOZIE-3210 [build] Revision information is empty (asalamon74 via andras.piros)
OOZIE-2684 Bad database schema error for WF_ACTIONS table (abhishekbafna, kmarton via andras.piros)
http://git-wip-us.apache.org/repos/asf/oozie/blob/9735dd38/webapp/src/main/webapp/oozie-console.js
----------------------------------------------------------------------
diff --git a/webapp/src/main/webapp/oozie-console.js b/webapp/src/main/webapp/oozie-console.js
index 1da42d1..5e087e5 100644
--- a/webapp/src/main/webapp/oozie-console.js
+++ b/webapp/src/main/webapp/oozie-console.js
@@ -1021,6 +1021,18 @@ function jobDetailsPopup(response, request) {
});
}
+ function createAndAddDagImage() {
+ var dagImage= new Ext.ux.Image({
+ id: 'dagImage',
+ url: getOozieBase() + 'job/' + workflowId + '?show=graph&format=svg&show-kill=true&v=' + Date.now(),
+ autoScroll: true
+ });
+ dagImage.onError('alertOnDAGError()');
+ imageContainer.add(dagImage);
+ imageContainer.syncSize();
+ imageContainer.doLayout(true);
+ }
+
var imageContainer = new Ext.Container({
autoEl: {},
height: '1000px',
@@ -1118,12 +1130,15 @@ function jobDetailsPopup(response, request) {
title: 'Job DAG',
items: imageContainer,
tbar: [{
- text: " "
- // To avoid OOM
- /*icon: 'ext-2.2/resources/images/default/grid/refresh.gif',
+ text: " ",
+ icon: 'ext-2.2/resources/images/default/grid/refresh.gif',
handler: function() {
- fetchDAG(workflowId);
- }*/
+ var child = imageContainer.findById('dagImage');
+ if (child != null) {
+ imageContainer.remove(child);
+ }
+ createAndAddDagImage();
+ }
}]
}]
});
@@ -1149,16 +1164,7 @@ function jobDetailsPopup(response, request) {
}
else if(selectedTab.title == 'Job DAG') {
if(!isLoadedDAG){
- var dagImage= new Ext.ux.Image({
- id: 'dagImage',
- url: getOozieBase() + 'job/' + workflowId + '?show=graph&format=svg&show-kill=true',
- autoScroll: true
- });
- dagImage.setAlt('Runtime error : Can\'t display the graph. Number of actions are more than display limit 25');
- dagImage.onError('alertOnDAGError()');
- imageContainer.add(dagImage);
- imageContainer.syncSize();
- imageContainer.doLayout(true);
+ createAndAddDagImage();
isLoadedDAG=true;
}
}