You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2013/03/18 18:52:37 UTC
svn commit: r1457893 - in /oozie/trunk: release-log.txt
webapp/src/main/webapp/oozie-console.js
Author: mona
Date: Mon Mar 18 17:52:37 2013
New Revision: 1457893
URL: http://svn.apache.org/r1457893
Log:
OOZIe-1208 Oozie web-console when displaying Coord Job Log for an action gives Format Error (rohini via mona)
Modified:
oozie/trunk/release-log.txt
oozie/trunk/webapp/src/main/webapp/oozie-console.js
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1457893&r1=1457892&r2=1457893&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Mar 18 17:52:37 2013
@@ -7,6 +7,7 @@ OOZIE-1239 Bump up trunk to 4.1.0-SNAPSH
-- Oozie 4.0.0 (unreleased)
+OOZIE-1208 Oozie web-console when displaying Coord Job Log for an action gives Format Error (rohini via mona)
OOZIE-1269 Exception in push dependency check when there is also a pull dependency leaves it in waiting till timeout (rohini via virag)
OOZIE-1267 Dryrun option for push missing deps (virag)
OOZIE-1263 Fix few HCat dependency check issues (rohini via virag)
Modified: oozie/trunk/webapp/src/main/webapp/oozie-console.js
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/src/main/webapp/oozie-console.js?rev=1457893&r1=1457892&r2=1457893&view=diff
==============================================================================
--- oozie/trunk/webapp/src/main/webapp/oozie-console.js (original)
+++ oozie/trunk/webapp/src/main/webapp/oozie-console.js Mon Mar 18 17:52:37 2013
@@ -209,7 +209,7 @@ function jobDetailsPopup(response, reque
fieldLabel: 'Definition',
editable: false,
name: 'definition',
- width: 1005,
+ width: 1035,
height: 400,
autoScroll: true,
emptyText: "Loading..."
@@ -218,7 +218,7 @@ function jobDetailsPopup(response, reque
fieldLabel: 'Logs',
editable: false,
name: 'logs',
- width: 1010,
+ width: 1035,
height: 400,
autoScroll: true,
emptyText: "Loading..."
@@ -256,74 +256,74 @@ function jobDetailsPopup(response, reque
fieldLabel: 'Job Id',
editable: false,
name: 'id',
- width: 200,
+ width: 400,
value: jobDetails["id"]
}, {
fieldLabel: 'Name',
editable: false,
name: 'appName',
- width: 200,
+ width: 400,
value: jobDetails["appName"]
}, {
fieldLabel: 'App Path',
editable: false,
name: 'appPath',
- width: 200,
+ width: 400,
value: jobDetails["appPath"]
}, {
fieldLabel: 'Run',
editable: false,
name: 'run',
- width: 200,
+ width: 400,
value: jobDetails["run"]
}, {
fieldLabel: 'Status',
editable: false,
name: 'status',
- width: 200,
+ width: 400,
value: jobDetails["status"]
}, {
fieldLabel: 'User',
editable: false,
name: 'user',
- width: 200,
+ width: 400,
value: jobDetails["user"]
}, {
fieldLabel: 'Group',
editable: false,
name: 'group',
- width: 200,
+ width: 400,
value: jobDetails["group"]
}, {
fieldLabel: 'Create Time',
editable: false,
name: 'createdTime',
- width: 200,
+ width: 400,
value: jobDetails["createdTime"]
}, {
fieldLabel: 'Nominal Time',
editable: false,
name: 'nominalTime',
- width: 200,
+ width: 400,
value: jobDetails["nominalTime"]
}, {
fieldLabel: 'Start Time',
editable: false,
name: 'startTime',
- width: 200,
+ width: 400,
value: jobDetails["startTime"]
}, {
fieldLabel: 'Last Modified',
editable: false,
name: 'lastModTime',
- width: 200,
+ width: 400,
value: jobDetails["lastModTime"]
},{
fieldLabel: 'End Time',
editable: false,
name: 'endTime',
- width: 200,
+ width: 400,
value: jobDetails["endTime"]
}, ]
});
@@ -331,7 +331,6 @@ function jobDetailsPopup(response, reque
frame: true,
labelAlign: 'right',
labelWidth: 85,
- width: 1010,
items: [formFieldSet],
tbar: [ {
text: " ",
@@ -356,7 +355,7 @@ function jobDetailsPopup(response, reque
columns: [new Ext.grid.RowNumberer(), {
id: 'id',
header: "Action Id",
- width: 240,
+ width: 300,
sortable: true,
dataIndex: 'id'
}, {
@@ -395,7 +394,7 @@ function jobDetailsPopup(response, reque
autoScroll: true,
frame: true,
height: 400,
- width: 1200,
+ width: 1600,
title: 'Actions',
listeners: {
cellclick: {
@@ -498,7 +497,7 @@ function jobDetailsPopup(response, reque
frame: true,
labelAlign: 'right',
labelWidth: 85,
- width: 540,
+ //width: 540,
items: [formFieldSet]
});
var urlUnit = new Ext.FormPanel();
@@ -620,14 +619,13 @@ function jobDetailsPopup(response, reque
}, {
title: 'Job Definition',
items: jobDefinitionArea
-
}, {
title: 'Job Configuration',
items: new Ext.form.TextArea({
fieldLabel: 'Configuration',
editable: false,
name: 'config',
- width: 1010,
+ width: 1035,
height: 430,
autoScroll: true,
value: jobDetails["conf"]
@@ -642,7 +640,6 @@ function jobDetailsPopup(response, reque
fetchLogs(workflowId);
}
}]
-
}, {
title: 'Job DAG',
items: dagImg,
@@ -673,7 +670,7 @@ function jobDetailsPopup(response, reque
var win = new Ext.Window({
title: 'Job (Name: ' + appName + '/JobId: ' + workflowId + ')',
closable: true,
- width: 1020,
+ width: 1050,
autoHeight: true,
plain: true,
items: [jobDetailsTab, jobs_grid]
@@ -688,7 +685,7 @@ function coordJobDetailsPopup(response,
fieldLabel: 'Definition',
editable: false,
name: 'definition',
- width: 1005,
+ width: 1035,
height: 400,
autoScroll: true,
emptyText: "Loading..."
@@ -698,7 +695,7 @@ function coordJobDetailsPopup(response,
editable: false,
id: 'jobLogAreaId',
name: 'logs',
- width: 1010,
+ width: 1035,
height: 400,
autoScroll: true,
emptyText: "Loading..."
@@ -734,6 +731,7 @@ function coordJobDetailsPopup(response,
else {
Ext.Ajax.request({
url: getOozieBase() + 'job/' + coordJobId + "?show=log&type=action&scope="+actionsList,
+ timeout: 300000,
success: function(response, request) {
processAndDisplayLog(response.responseText);
},
@@ -783,37 +781,37 @@ function coordJobDetailsPopup(response,
fieldLabel: 'Name',
editable: false,
name: 'coordJobName',
- width: 200,
+ width: 400,
value: jobDetails["coordJobName"]
}, {
fieldLabel: 'Status',
editable: false,
name: 'status',
- width: 200,
+ width: 400,
value: jobDetails["status"]
}, {
fieldLabel: 'User',
editable: false,
name: 'user',
- width: 200,
+ width: 400,
value: jobDetails["user"]
}, {
fieldLabel: 'Group',
editable: false,
name: 'group',
- width: 200,
+ width: 400,
value: jobDetails["group"]
}, {
fieldLabel: 'Frequency',
editable: false,
name: 'frequency',
- width: 200,
+ width: 400,
value: jobDetails["frequency"]
}, {
fieldLabel: 'Unit',
editable: false,
name: 'timeUnit',
- width: 200,
+ width: 400,
value: jobDetails["timeUnit"]
}, {
fieldLabel: 'Start Time',
@@ -851,7 +849,6 @@ function coordJobDetailsPopup(response,
frame: true,
labelAlign: 'right',
labelWidth: 85,
- width: 1010,
items: [formFieldSet],
tbar: [ {
text: " ",
@@ -876,7 +873,7 @@ function coordJobDetailsPopup(response,
columns: [new Ext.grid.RowNumberer(), {
id: 'id',
header: "Action Id",
- width: 240,
+ width: 260,
sortable: true,
dataIndex: 'id'
}, {
@@ -896,12 +893,12 @@ function coordJobDetailsPopup(response,
dataIndex: 'errorCode'
}, {
header: "Created Time",
- width: 160,
+ width: 170,
sortable: true,
dataIndex: 'createdTime'
}, {
header: "Nominal Time",
- width: 160,
+ width: 170,
sortable: true,
dataIndex: 'nominalTime'
}, {
@@ -915,7 +912,7 @@ function coordJobDetailsPopup(response,
autoScroll: true,
frame: true,
height: 400,
- width: 1000,
+ width: 1600,
title: 'Actions',
listeners: {
cellclick: {
@@ -1071,7 +1068,7 @@ function coordJobDetailsPopup(response,
fieldLabel: 'Configuration',
editable: false,
name: 'config',
- width: 1010,
+ width: 1035,
height: 430,
autoScroll: true,
value: jobDetails["conf"]
@@ -1099,11 +1096,10 @@ function coordJobDetailsPopup(response,
}
coord_jobs_grid.setVisible(false);
});
-
var win = new Ext.Window({
title: 'Job (Name: ' + appName + '/coordJobId: ' + coordJobId + ')',
closable: true,
- width: 1020,
+ width: 1050,
autoHeight: true,
plain: true,
items: [jobDetailsTab, coord_jobs_grid]
@@ -1143,25 +1139,25 @@ function bundleJobDetailsPopup(response,
fieldLabel: 'Name',
editable: false,
name: 'bundleJobName',
- width: 200,
+ width: 400,
value: jobDetails["bundleJobName"]
}, {
fieldLabel: 'Status',
editable: false,
name: 'status',
- width: 200,
+ width: 400,
value: jobDetails["status"]
}, {
fieldLabel: 'Kickoff Time',
editable: false,
name: 'kickoffTime',
- width: 200,
+ width: 400,
value: jobDetails["kickoffTime"]
}, {
fieldLabel: 'Created Time',
editable: false,
name: 'createdTime',
- width: 200,
+ width: 400,
value: jobDetails["createdTime"]
}, {
fieldLabel: 'User',
@@ -1876,7 +1872,7 @@ function initConsole() {
columns: [new Ext.grid.RowNumberer(), {
id: 'id',
header: "Job Id",
- width: 190,
+ width: 220,
sortable: true,
dataIndex: 'id'
}, {
@@ -2028,12 +2024,12 @@ function initConsole() {
sortable: true,
dataIndex: 'group'
}, {
- header: "frequency",
+ header: "Frequency",
width: 70,
sortable: true,
dataIndex: 'frequency'
}, {
- header: "unit",
+ header: "Unit",
width: 60,
sortable: true,
dataIndex: 'timeUnit'
@@ -2171,10 +2167,10 @@ function initConsole() {
}}
}]
});
+ // main tab panel containing Workflow Jobs, Coordinator Jobs, Bundle Jobs, System Info, ...
var tabs = new Ext.TabPanel({
renderTo: 'oozie-console',
height: 500,
- width: 1050,
title: "Oozie Web Console"
});