You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/02/19 22:51:26 UTC

git commit: AMBARI-4750. Tez DAG UI not showing due to changed ATS responses. (srimanth)

Repository: ambari
Updated Branches:
  refs/heads/trunk 4b9ef03bf -> 0e049a287


AMBARI-4750. Tez DAG UI not showing due to changed ATS responses. (srimanth)


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

Branch: refs/heads/trunk
Commit: 0e049a287be503a1e0c8475020d7640162584c1f
Parents: 4b9ef03
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Feb 19 11:42:37 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Feb 19 13:51:16 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/mappers/jobs/hive_job_mapper.js | 7 ++++---
 ambari-web/app/models/service/yarn.js          | 2 +-
 ambari-web/app/styles/application.less         | 3 ++-
 ambari-web/app/styles/apps.less                | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0e049a28/ambari-web/app/mappers/jobs/hive_job_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/jobs/hive_job_mapper.js b/ambari-web/app/mappers/jobs/hive_job_mapper.js
index 012401b..ccdb292 100644
--- a/ambari-web/app/mappers/jobs/hive_job_mapper.js
+++ b/ambari-web/app/mappers/jobs/hive_job_mapper.js
@@ -54,8 +54,9 @@ App.hiveJobMapper = App.QuickDataMapper.create({
     if (json && json.entity) {
       var hiveJob = {};
       hiveJob.id = json.entity;
-      hiveJob.startTime = json.otherinfo.startTime;
-      hiveJob.endTime = json.otherinfo.endTime;
+      hiveJob.startTime = json.starttime;
+      hiveJob.endTime = json.endtime;
+      json.otherinfo.query = $.parseJSON(json.otherinfo.query).query;
       hiveJob.queryText = json.otherinfo.query.queryText;
       hiveJob.stages = [];
       var stagePlans = json.otherinfo.query.queryPlan["STAGE PLANS"];
@@ -69,7 +70,7 @@ App.hiveJobMapper = App.QuickDataMapper.create({
         };
         hiveJob.stages.push(stageItem);
         if (stageValue.Tez != null && hiveJob.tezDag == null) {
-          var dagName = stageValue.Tez.DagName;
+          var dagName = stageValue.Tez['DagName:'];
           // Vertices
           var vertices = [];
           var vertexIds = [];

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e049a28/ambari-web/app/models/service/yarn.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/yarn.js b/ambari-web/app/models/service/yarn.js
index f78b257..9da1c09 100644
--- a/ambari-web/app/models/service/yarn.js
+++ b/ambari-web/app/models/service/yarn.js
@@ -42,7 +42,7 @@ App.YARNService = App.Service.extend({
     if(yarnConf){
       return yarnConf.properties['yarn.ahs.webapp.address'].match(/:(\d+)/)[1];;
     }
-    return "";
+    return "8188";
   }.property(),
   yarnClientNodes: function(){
     return this.get('hostComponents').filterProperty('componentName', 'YARN_CLIENT').mapProperty('host');

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e049a28/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 799901c..81af3ec 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5579,7 +5579,8 @@ i.icon-asterisks {
     }
     tr td:first-child {
       font-weight: bold;
-      width: 20%
+      width: 20%;
+      overflow: scroll;
     }
     textarea {
       width: 95%;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e049a28/ambari-web/app/styles/apps.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/apps.less b/ambari-web/app/styles/apps.less
index 3829373..538be32 100644
--- a/ambari-web/app/styles/apps.less
+++ b/ambari-web/app/styles/apps.less
@@ -394,6 +394,7 @@
     th:first-child {
       border-left-width: 1px;
       width: 35%;
+      overflow: scroll;
     }
     td:first-child + td,
     th:first-child + th,