tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject tez git commit: TEZ-2291. TEZ UI: Improper vertex name in tables. (sree)
Date Fri, 19 Jun 2015 10:51:15 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 5e578f803 -> ddeb60d4c


TEZ-2291. TEZ UI: Improper vertex name in tables. (sree)

(cherry picked from commit 4995bccdb0b9b1bd491f21c34f3dbfca82710df9)


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

Branch: refs/heads/branch-0.7
Commit: ddeb60d4cdfeafb065e467c717ffddb854c65ee0
Parents: 5e578f8
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Fri Jun 19 16:19:04 2015 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Fri Jun 19 16:20:31 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 .../scripts/controllers/dag-task-attempts-controller.js   |  8 ++++++--
 .../src/main/webapp/app/scripts/controllers/dag_tasks.js  |  8 ++++++--
 .../main/webapp/app/scripts/controllers/dag_vertices.js   |  6 ++----
 .../webapp/app/scripts/controllers/dags_controller.js     |  4 ++--
 .../scripts/controllers/task_task_attempts_controller.js  |  2 +-
 .../webapp/app/scripts/controllers/tasks_controller.js    | 10 ++++------
 .../app/scripts/controllers/tez-app-dags-controller.js    |  4 ++--
 .../app/scripts/controllers/vertex-inputs-controller.js   |  2 +-
 .../controllers/vertex_task_attempts_controller.js        |  2 +-
 .../app/scripts/controllers/vertex_tasks_controller.js    |  2 +-
 11 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index acefe32..310023b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2291. TEZ UI: Improper vertex name in tables.
   TEZ-2567. Tez UI: download dag data does not work within ambari
   TEZ-2545. It is not necessary to start the vertex group commit when DAG is in TERMINATING
   TEZ-2554. Tez UI: View log link does not correctly propagate login crendential to read
log from yarn web.

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/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 ce8f4e9..9c3301f 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
@@ -206,7 +206,11 @@ App.DagTaskAttemptsController = App.TablePageController.extend({
         }
       }
     ];
-  }.property(),
+  }.property(
+    'controllers.dag.vertexIdToNameMap',
+    'controllers.dag.yarnAppState',
+    'controllers.dag.tezApp.user'
+  ),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -217,6 +221,6 @@ App.DagTaskAttemptsController = App.TablePageController.extend({
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
index c3df785..81e4277 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
@@ -177,7 +177,11 @@ App.DagTasksController = App.TablePageController.extend({
         }
       }
     ];
-  }.property('id'),
+  }.property(
+    'controllers.dag.vertexIdToNameMap',
+    'controllers.dag.yarnAppState',
+    'controllers.dag.tezApp.user'
+  ),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -188,6 +192,6 @@ App.DagTasksController = App.TablePageController.extend({
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
index cdfbf21..b4ac5cc 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_vertices.js
@@ -81,8 +81,6 @@ App.DagVerticesController = App.TablePageController.extend({
   },
 
   defaultColumnConfigs: function() {
-    var that = this;
-
     function onProgressChange() {
       var progress = this.get('vertex.progress'),
           pct;
@@ -204,7 +202,7 @@ App.DagVerticesController = App.TablePageController.extend({
         }
       }
     ];
-  }.property('id'),
+  }.property(),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -215,6 +213,6 @@ App.DagVerticesController = App.TablePageController.extend({
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/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 9746906..b89ba9f 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
@@ -320,7 +320,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.C
         }
       }
     ];
-  }.property('id'),
+  }.property(),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -331,6 +331,6 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.C
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js
b/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js
index 75bd4c8..b3c8c76 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/task_task_attempts_controller.js
@@ -171,7 +171,7 @@ App.TaskAttemptsController = App.TablePageController.extend(App.AutoCounterColum
         }
       }
     ];
-  }.property('filterEntityId'),
+  }.property('yarnAppState', 'controllers.task.tezApp.user'),
 
 });
 

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js
index 366a86a..2c8e402 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/tasks_controller.js
@@ -59,7 +59,7 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.
   },
 
   defaultColumnConfigs: function() {
-    var that = this;
+    var vertexIdToNameMap = this.get('vertexIdToNameMap');
     return [
       {
         id: 'taskId',
@@ -74,8 +74,7 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.
         id: 'vertexName',
         headerCellName: 'Vertex Name',
         getCellContent: function(row) {
-          var vertexId = row.get('vertexID'),
-              vertexIdToNameMap = that.get('vertexIdToNameMap');
+          var vertexId = row.get('vertexID');
           return vertexIdToNameMap[vertexId] || vertexId;
         }
       },
@@ -112,8 +111,7 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.
         }
       }
     ];
-    
-  }.property('id'),
+  }.property('vertexIdToNameMap'),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -124,6 +122,6 @@ App.TasksController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js
index a61f8bb..3cbecae 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-dags-controller.js
@@ -150,7 +150,7 @@ App.TezAppDagsController = App.TablePageController.extend({
         },
       }
     ];
-  }.property('id'),
+  }.property(),
 
   columnConfigs: function() {
     return this.get('defaultColumnConfigs').concat(
@@ -161,6 +161,6 @@ App.TezAppDagsController = App.TablePageController.extend({
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js
index 9bc228c..21f6136 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex-inputs-controller.js
@@ -89,6 +89,6 @@ App.VertexInputsController = Em.ObjectController.extend(App.PaginatedContentMixi
         )
       )
     );
-  }.property(),
+  }.property('defaultColumnConfigs'),
 
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/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 df714d0..914cf6a 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
@@ -189,6 +189,6 @@ App.VertexTaskAttemptsController = App.TablePageController.extend(App.AutoCounte
         }
       }
     ];
-  }.property('filterEntityId'),
+  }.property('controllers.vertex.yarnAppState', 'controllers.vertex.tezApp.user'),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ddeb60d4/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
index 4574050..2709d64 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
@@ -160,6 +160,6 @@ App.VertexTasksController = App.TablePageController.extend(App.AutoCounterColumn
         }
       }
     ];
-  }.property('filterEntityId')
+  }.property('controllers.vertex.yarnAppState', 'controllers.vertex.tezApp.user')
 
 });
\ No newline at end of file


Mime
View raw message