flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/3] flink git commit: [FLINK-2966][web-dashboard] Improve the way job duration is reported
Date Tue, 10 Nov 2015 14:15:09 GMT
Repository: flink
Updated Branches:
  refs/heads/master e058abba7 -> d7da7d4aa


http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
index bf9f640..41dfe14 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
@@ -38,7 +38,7 @@ limitations under the License.
       <tr ng-repeat="job in jobs|orderBy:&quot;'end-time'&quot;:true" ui-sref="single-job.plan.overview({
jobid: job.jid })">
         <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
         <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
-        <td>{{job.duration}} ms</td>
+        <td title="{{job.duration | humanizeDuration:false}}">{{job.duration | humanizeDuration:true}}</td>
         <td>{{job.name}}</td>
         <td>{{job.jid}}</td>
         <td class="label-group">

http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
index 8869507..5e80d1e 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
@@ -31,7 +31,7 @@ limitations under the License.
   <div class="navbar-info first last hidden-xs hidden-sm">{{ job['start-time'] | amDateFormat:'YYYY-MM-DD,
H:mm:ss' }}<span ng-if="job['end-time'] &gt; -1">
       - 
       {{ job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></div>
-  <div ng-if="job.duration &gt; -1" class="navbar-info last first">{{job.duration}}
ms</div>
+  <div ng-if="job.duration &gt; -1" title="{{job.duration | humanizeDuration:false}}"
class="navbar-info last first">{{job.duration | humanizeDuration:true}}</div>
   <div ng-if="job.state=='RUNNING' || job.state=='CREATED'" class="navbar-info last first"><span
ng-click="cancelJob($event)" class="navbar-info-button btn btn-default">Cancel</span></div>
 </nav>
 <nav ng-if="job" class="navbar navbar-default navbar-fixed-top navbar-main-additional">

http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/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 fda8b75..daba67d 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
@@ -36,7 +36,7 @@ limitations under the License.
     <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>
+      <td><span ng-if="v.duration &gt; -1" title="{{v.duration | humanizeDuration:false}}">{{v.duration
| humanizeDuration:true}}</span></td>
       <td class="td-long">{{ v.name | humanizeText }}</td>
       <td>{{ v.metrics['read-bytes'] | number }}</td>
       <td>{{ v.metrics['read-records'] | number }}</td>

http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/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 b549b7a..147b14d 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
@@ -37,7 +37,7 @@ limitations under the License.
     <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>
+      <td><span ng-if="subtask.duration &gt; -1" title="{{subtask.duration |
humanizeDuration:false}}">{{subtask.duration | humanizeDuration:true}}</span></td>
       <td><span ng-if="subtask.metrics['read-bytes'] &gt; -1">{{ subtask.metrics['read-bytes']
| number }}</span></td>
       <td><span ng-if="subtask.metrics['read-records'] &gt; -1">{{ subtask.metrics['read-records']
| number }}</span></td>
       <td><span ng-if="subtask.metrics['write-bytes'] &gt; -1">{{ subtask.metrics['write-bytes']
| number }}</span></td>

http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
index 5d95f47..ff77877 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
@@ -38,7 +38,7 @@ limitations under the License.
       <tr ng-repeat="job in jobs|orderBy:&quot;'start-time'&quot;" ui-sref="single-job.plan.overview({
jobid: job.jid })">
         <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
         <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
-        <td>{{job.duration}} ms</td>
+        <td title="{{job.duration | humanizeDuration:false}}">{{job.duration | humanizeDuration:true}}</td>
         <td>{{job.name}}</td>
         <td>{{job.jid}}</td>
         <td class="label-group">

http://git-wip-us.apache.org/repos/asf/flink/blob/d7da7d4a/flink-runtime-web/web-dashboard/web/partials/overview.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/overview.html b/flink-runtime-web/web-dashboard/web/partials/overview.html
index 295ee27..24e8f93 100644
--- a/flink-runtime-web/web-dashboard/web/partials/overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/overview.html
@@ -95,7 +95,7 @@ limitations under the License.
           <tr ng-repeat="job in runningJobs|orderBy:&quot;'start-time'&quot;"
ui-sref="single-job.plan.overview({ jobid: job.jid })">
             <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
             <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
-            <td>{{job.duration}} ms</td>
+            <td title="{{job.duration | humanizeDuration:false}}">{{job.duration |
humanizeDuration:true}}</td>
             <td>{{job.name}}</td>
             <td>{{job.jid}}</td>
             <td class="label-group">
@@ -130,7 +130,7 @@ limitations under the License.
           <tr ng-repeat="job in finishedJobs|orderBy:&quot;'end-time'&quot;:true"
ui-sref="single-job.plan.overview({ jobid: job.jid })">
             <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
             <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
-            <td>{{job.duration}} ms</td>
+            <td title="{{job.duration | humanizeDuration:false}}">{{job.duration |
humanizeDuration:true}}</td>
             <td>{{job.name}}</td>
             <td>{{job.jid}}</td>
             <td class="label-group">


Mime
View raw message