tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject [50/53] tez git commit: TEZ-1820. Fix wrong links. (Sreenath Somarajapuram via hitesh)
Date Wed, 10 Dec 2014 03:34:13 GMT
TEZ-1820. Fix wrong links. (Sreenath Somarajapuram via hitesh)


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

Branch: refs/heads/master
Commit: 9e2a3dc0330ba3675d614dc146a43b3334ad6b98
Parents: 3ec89d6
Author: Hitesh Shah <hitesh@apache.org>
Authored: Thu Dec 4 10:22:23 2014 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Thu Dec 4 10:22:23 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                        | 17 ++++++++++-------
 tez-ui/src/main/webapp/Gruntfile.js                |  7 ++++---
 .../controllers/dag-task-attempts-controller.js    |  5 ++---
 .../app/scripts/controllers/dags_controller.js     |  2 +-
 .../app/scripts/controllers/tez-app-controller.js  |  4 +++-
 .../controllers/vertex_task_attempts_controller.js |  5 ++---
 tez-ui/src/main/webapp/app/scripts/models/dag.js   |  4 ++--
 tez-ui/src/main/webapp/app/templates/tez-app.hbs   |  2 +-
 8 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8249d71..c610896 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,15 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1733. TezMerger should sort FileChunks on size when merging
+  TEZ-1738. Tez tfile parser for log parsing
+  TEZ-1627. Remove OUTPUT_CONSUMABLE and related Event in TaskAttemptImpl
+  TEZ-1736. Add support for Inputs/Outputs in runtime-library to generate history text data.
+  TEZ-1721. Update INSTALL instructions for clarifying tez client jars
+    compatibility with runtime tarball on HDFS.
+  TEZ-1690. TestMultiMRInput tests fail because of user collisions.
+
+TEZ-UI CHANGES (TEZ-8):
   TEZ-1799. Enable Cross Origin Support in Tez UI
   TEZ-1634. Fix compressed IFile shuffle errors
   TEZ-1615. Skeleton framework for Tez UI
@@ -20,14 +29,8 @@ ALL CHANGES:
   TEZ-1765. Allow dropdown lists in table filters.
   TEZ-1606. Counters View for DAG, Vertex, and Task.
   TEZ-1768. follow up jira to address minor issues in Tez-ui.
-  TEZ-1733. TezMerger should sort FileChunks on size when merging
-  TEZ-1738. Tez tfile parser for log parsing
-  TEZ-1627. Remove OUTPUT_CONSUMABLE and related Event in TaskAttemptImpl
-  TEZ-1736. Add support for Inputs/Outputs in runtime-library to generate history text data.
-  TEZ-1721. Update INSTALL instructions for clarifying tez client jars
-    compatibility with runtime tarball on HDFS.
-  TEZ-1690. TestMultiMRInput tests fail because of user collisions.
   TEZ-1783. Wrapper in standalone mode.
+  TEZ-1820. Fix wrong links.
 
 Release 0.5.3: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/Gruntfile.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/Gruntfile.js b/tez-ui/src/main/webapp/Gruntfile.js
index 21d471b..b096fca 100644
--- a/tez-ui/src/main/webapp/Gruntfile.js
+++ b/tez-ui/src/main/webapp/Gruntfile.js
@@ -205,7 +205,8 @@ module.exports = function (grunt) {
             '<%= yeoman.app %>/styles/{,*/}*.css',
             '<%= yeoman.app %>/bower_components/bootstrap/dist/css/bootstrap.css',
             '<%= yeoman.app %>/bower_components/ember-table/dist/ember-table.css',
-            '<%= yeoman.app %>/bower_components/font-awesome/css/font-awesome.css'
+            '<%= yeoman.app %>/bower_components/font-awesome/css/font-awesome.css',
+            '<%= yeoman.app %>/bower_components/jquery-ui/themes/smoothness/jquery-ui.css'
           ]
         }
       }
@@ -281,7 +282,7 @@ module.exports = function (grunt) {
           {
             expand: true,
             flatten: true,
-            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
+            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/smoothness/images/*',
             dest: '<%= yeoman.dist %>/styles/images/'
           },
           {
@@ -315,7 +316,7 @@ module.exports = function (grunt) {
           {
             expand: true,
             flatten: true,
-            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*',
+            src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/smoothness/images/*',
             dest: '.tmp/styles/images/'
           },
           {

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
index d4564b8..9648b96 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
@@ -161,9 +161,8 @@ App.DagTaskAttemptsController = Em.ObjectController.extend(App.PaginatedContentM
             </span>')
         }),
         getCellContent: function(row) {
-          var attempt = row.get('pivotAttempt');
-          var logFile = attempt && (attempt.get('inProgressLog') || attempt.get('completedLog'));
-          if(logFile) logFile += "/syslog_" + attempt.get('id');
+          var logFile = row.get('inProgressLog') || row.get('completedLog');
+          if(logFile) logFile += "/syslog_" + row.get('id');
           return logFile;
         }
       }

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
index 2ded68e..2948eeb 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
@@ -213,7 +213,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.C
         }),
         getCellContent: function(row) {
           return  {
-            enableLink: row.get('tezApp'),
+            enableLink: row.get('tezApp') && row.get('appDetail'),
             appId: row.get('applicationId')
           }
         }

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-controller.js
index cae8a35..64682d4 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-controller.js
@@ -23,7 +23,9 @@ App.TezAppController = Em.ObjectController.extend(App.Helpers.DisplayHelper,
{
 
   loading: true,
 
-  RMWebUrl: App.env.RMWebUrl,
+  rmTrackingURL: function() {
+    return App.env.RMWebUrl + '/cluster/app/tez_' + this.get('id');
+  }.property('id'),
 
   updateLoading: function() {
     this.set('loading', false);

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js
b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js
index 6512bd4..da95834 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_task_attempts_controller.js
@@ -162,9 +162,8 @@ App.VertexTaskAttemptsController = Em.ObjectController.extend(App.PaginatedConte
             </span>')
         }),
         getCellContent: function(row) {
-          var attempt = row.get('pivotAttempt');
-          var logFile = attempt && (attempt.get('inProgressLog') || attempt.get('completedLog'));
-          if(logFile) logFile += "/syslog_" + attempt.get('id');
+          var logFile = row.get('inProgressLog') || row.get('completedLog');
+          if(logFile) logFile += "/syslog_" + row.get('id');
           return logFile;
         }
       }

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/scripts/models/dag.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/dag.js b/tez-ui/src/main/webapp/app/scripts/models/dag.js
index fa40f5a..e677478 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/dag.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/dag.js
@@ -37,8 +37,8 @@ App.Dag = App.AbstractEntity.extend({
 	// application ID of this dag.
 	applicationId: DS.attr('string'),
 
-  tezApp: DS.belongsTo('tezApp', {async: true}),
-  appDetail: DS.belongsTo('appDetail', {async: true}),
+  tezApp: DS.belongsTo('tezApp'),
+  appDetail: DS.belongsTo('appDetail'),
 
 	// status
 	status: DS.attr('string'),

http://git-wip-us.apache.org/repos/asf/tez/blob/9e2a3dc0/tez-ui/src/main/webapp/app/templates/tez-app.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/tez-app.hbs b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
index 7fd5a59..f9c5b29 100644
--- a/tez-ui/src/main/webapp/app/templates/tez-app.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
@@ -28,7 +28,7 @@
         <tbody>
           <tr>
             <td>YARN RM Tracking URL</td>
-            <td><a href="{{unbound RMWebUrl}}/cluster/app/tez_{{unbound id}}">{{unbound
id}}</a></td>
+            <td><a {{bind-attr href=rmTrackingURL}}>{{unbound id}}</a></td>
           </tr>
           <tr>
             <td>Attempt Id</td>


Mime
View raw message