You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/12 08:27:50 UTC

[04/12] tez git commit: TEZ-2068. Tez UI: Dag view should use full window height, disable webuiservice in localmode. (Sreenath Somarajapuram via hitesh)

TEZ-2068. Tez UI: Dag view should use full window height, disable webuiservice in localmode. (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/0485330d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0485330d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0485330d

Branch: refs/heads/TEZ-2003
Commit: 0485330dd992d408f3bef5c87b3bb567a15a8dcd
Parents: 76436f4
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Feb 11 11:56:28 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Feb 11 11:56:28 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../java/org/apache/tez/client/LocalClient.java |  3 +++
 tez-ui/src/main/webapp/app/styles/dag-view.less |  4 ++--
 .../src/main/webapp/app/templates/dag/view.hbs  | 24 +++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0485330d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a42b29b..231173d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,6 +61,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2068. Tez UI: Dag view should use full window height, disable webuiservice in localmode.
   TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled. 
   TEZ-2069. Tez UI: appId should link to application in dag details view.
   TEZ-2063. Tez UI: Flaky log url in tasks table.

http://git-wip-us.apache.org/repos/asf/tez/blob/0485330d/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
index 1956f0d..8649a4d 100644
--- a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
+++ b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
@@ -83,6 +83,9 @@ public class LocalClient extends FrameworkClient {
     tezConf.set(TezConfiguration.TEZ_AM_DAG_SCHEDULER_CLASS, localModeDAGSchedulerClassName);
     isSession = tezConf.getBoolean(TezConfiguration.TEZ_AM_SESSION_MODE,
         TezConfiguration.TEZ_AM_SESSION_MODE_DEFAULT);
+
+    // disable web service for local mode.
+    this.conf.setBoolean(TezConfiguration.TEZ_AM_WEBSERVICE_ENABLE, false);
   }
 
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0485330d/tez-ui/src/main/webapp/app/styles/dag-view.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/dag-view.less b/tez-ui/src/main/webapp/app/styles/dag-view.less
index 3deb074..0ad61e2 100644
--- a/tez-ui/src/main/webapp/app/styles/dag-view.less
+++ b/tez-ui/src/main/webapp/app/styles/dag-view.less
@@ -38,11 +38,11 @@
   .svg-container {
     width:100%;
     overflow:hidden;
-    height: 450px;
+    height: 100%;
 
     svg {
-      height: 450px;
       width: 100%;
+      height: 100%;
     }
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0485330d/tez-ui/src/main/webapp/app/templates/dag/view.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag/view.hbs b/tez-ui/src/main/webapp/app/templates/dag/view.hbs
index 1057a20..27ee267 100644
--- a/tez-ui/src/main/webapp/app/templates/dag/view.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag/view.hbs
@@ -16,14 +16,16 @@
 * limitations under the License.
 }}
 
-{{#unless loading}}
-  {{dag-view-component
-    data=viewData
-    vertexProperties=columns
-    entityClicked='entityClicked'
-    configure='selectColumns'
-  }}
-  <div class="dag-view-legend">Double click source/sink bubble to toggle visibility locally.</div>
-{{else}}
-  {{partial 'partials/loading-spinner'}}
-{{/unless}}
\ No newline at end of file
+<div class="dag-view-component-container">
+  {{#unless loading}}
+    {{dag-view-component
+      data=viewData
+      vertexProperties=columns
+      entityClicked='entityClicked'
+      configure='selectColumns'
+    }}
+    <div class="dag-view-legend">Double click source/sink bubble to toggle visibility locally.</div>
+  {{else}}
+    {{partial 'partials/loading-spinner'}}
+  {{/unless}}
+</div>