flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [36/51] [abbrv] flink git commit: [FLINK-2357] [web dashboard] Add subtasks to vertex display
Date Thu, 17 Sep 2015 18:20:08 GMT
http://git-wip-us.apache.org/repos/asf/flink/blob/93a4d31d/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.accumulators.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.accumulators.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.accumulators.html
index e3a20e3..8de3921 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.accumulators.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.accumulators.html
@@ -24,8 +24,8 @@ limitations under the License.
       <th>Status</th>
     </tr>
   </thead>
-  <tbody ng-repeat="v in job.vertices" ng-class="{ active: v.id == nodeid }" ng-click="changeNode(v.id)">
-    <tr>
+  <tbody ng-repeat="v in job.vertices" ng-class="{ active: v.id == nodeid }" ng-click="v.id
== nodeid || changeNode(v.id)">
+    <tr ng-if="v.type == 'regular'">
       <td>{{ v.name | humanizeText }}</td>
       <td> 
         <bs-label status="{{v.status}}">{{v.status}}</bs-label>

http://git-wip-us.apache.org/repos/asf/flink/blob/93a4d31d/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
index 01440f8..1706d3e 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.overview.html
@@ -33,7 +33,7 @@ limitations under the License.
     </tr>
   </thead>
   <tbody ng-repeat="v in job.vertices" ng-class="{ active: v.id == nodeid }" ng-click="changeNode(v.id)">
-    <tr>
+    <tr ng-if="v.type == 'regular'">
       <td><span ng-if="v['start-time'] &gt; -1">{{ v['start-time'] | amDateFormat:'YYYY-MM-DD,
H:mm:ss' }}</span></td>
       <td><span ng-if="v['end-time'] &gt; -1">{{ v['end-time'] | amDateFormat:'YYYY-MM-DD,
H:mm:ss' }}</span></td>
       <td><span ng-if="v.duration &gt; -1">{{ v.duration }} ms</span></td>

http://git-wip-us.apache.org/repos/asf/flink/blob/93a4d31d/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.accumulators.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.accumulators.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.accumulators.html
index 6a79a7b..e7dcf2c 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.accumulators.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.accumulators.html
@@ -17,11 +17,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-<div ng-if="vertex">
-  <div ng-if="vertex.accumulators.length == 0">
-    <p><i>No accumulators</i></p>
-  </div>
-  <table ng-if="vertex.accumulators.length &gt; 0" class="table table-hover table-clickable
table-activable table-inner">
+<div ng-if="accumulators.length == 0">
+  <p><i>No accumulators</i></p>
+</div>
+<div ng-if="accumulators &amp;&amp; accumulators.length &gt; 0">
+  <table class="table table-hover table-clickable table-activable table-inner">
     <thead>
       <tr>
         <th>Name</th>
@@ -30,11 +30,39 @@ limitations under the License.
       </tr>
     </thead>
     <tbody>
-      <tr ng-repeat="accumulator in vertex.accumulators">
-        <td>{{ accumulator.name }}</td>
-        <td>{{ accumulator.type }}</td>
-        <td>{{ accumulator.value }}</td>
+      <tr ng-repeat="accumulator in accumulators">
+        <td width="30%">{{ accumulator.name }}</td>
+        <td width="30%">{{ accumulator.type }}</td>
+        <td width="30%">{{ accumulator.value }}</td>
       </tr>
     </tbody>
   </table>
+  <div ng-if="!nodeUnfolded"><a ng-click="toggleFold()" class="btn btn-default">
+      Show subtasks
+       <i class="fa fa-chevron-down"></i></a><a ng-click="deactivateNode();
$event.stopPropagation()" title="Fold" class="btn btn-default pull-right"><i class="fa
fa-chevron-up"></i></a></div>
+  <div ng-if="nodeUnfolded &amp;&amp; subtaskAccumulators &amp;&amp; subtaskAccumulators.length
&gt; 0"><a ng-click="toggleFold()" class="btn btn-default">
+      Hide subtasks
+       <i class="fa fa-chevron-up"></i></a>
+    <table class="table table-hover table-clickable table-activable table-inner">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Type</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody ng-if="subtask['user-accumulators'] &amp;&amp; subtask['user-accumulators'].length
&gt; 0" ng-repeat="subtask in subtaskAccumulators">
+        <tr>
+          <td colwidth="3">
+            <div class="small-label">({{ subtask.subtask }}) {{ subtask.host }}, attempt:
{{ subtask.attempt + 1 }}</div>
+          </td>
+        </tr>
+        <tr ng-repeat="accumulator in subtask['user-accumulators']">
+          <td width="30%">{{ accumulator.name }}</td>
+          <td width="30%">{{ accumulator.type }}</td>
+          <td width="30%">{{ accumulator.value }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink/blob/93a4d31d/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
index 451c3a5..40b16bc 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.subtasks.html
@@ -18,7 +18,7 @@ limitations under the License.
 
 
 -->
-<table ng-if="vertex" class="table table-hover table-clickable table-activable table-inner">
+<table ng-if="subtasks" class="table table-hover table-clickable table-activable table-inner">
   <thead>
     <tr>
       <th>Start Time</th>
@@ -34,7 +34,7 @@ limitations under the License.
     </tr>
   </thead>
   <tbody>
-    <tr ng-repeat="subtask in vertex.st">
+    <tr ng-repeat="subtask in subtasks">
       <td><span ng-if="subtask['start-time'] &gt; -1">{{ subtask['start-time']
| amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
       <td><span ng-if="subtask['end-time'] &gt; -1">{{ subtask['end-time']
| amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
       <td><span ng-if="subtask.duration &gt; -1">{{ subtask.duration }} ms</span></td>

http://git-wip-us.apache.org/repos/asf/flink/blob/93a4d31d/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.html
index 4d15201..2f22576 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.html
@@ -18,6 +18,6 @@ limitations under the License.
 
 -->
 <div class="canvas-wrapper">
-  <div timeline="timeline" job="job" class="timeline-canvas"></div>
+  <div timeline="timeline" vertices="vertices" jobid="jobid" class="timeline-canvas"></div>
 </div>
 <div ui-view="vertex"></div>
\ No newline at end of file


Mime
View raw message