You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/07 14:08:05 UTC
[07/30] flink git commit: [FLINK-7648] [flip6] Write
HardwareDescription in sub object of legacy.TaskManagersHandler
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.taskmanagers.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.taskmanagers.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.taskmanagers.html
index 0f19a9e..eef7a95 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.taskmanagers.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.taskmanagers.html
@@ -36,7 +36,7 @@ limitations under the License.
<tr>
<td><span ng-if="v['start-time'] > -1">{{ v['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
<td><span ng-if="v['end-time'] > -1">{{ v['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></td>
- <td><span ng-if="v.duration > -1" title="{{v.duration | humanizeDuration:false}}">{{v.duration | humanizeDuration:true}}</span></td>
+ <td><span ng-if="v.duration > -1" title="{{v.duration | humanizeDuration:false}}">{{v.duration | humanizeDuration:true}} </span></td>
<td><span ng-if="tm.metrics['read-bytes-complete']">{{ tm.metrics['read-bytes'] | humanizeBytes }}</span><i ng-if="!tm.metrics['read-bytes-complete']" aria-hidden="true" class="fa fa-spinner fa-spin fa-fw"></i></td>
<td><span ng-if="tm.metrics['read-records-complete']">{{ tm.metrics['read-records'] | number }}</span><i ng-if="!tm.metrics['read-records-complete']" aria-hidden="true" class="fa fa-spinner fa-spin fa-fw"></i></td>
<td><span ng-if="tm.metrics['write-bytes-complete']">{{ tm.metrics['write-bytes'] | humanizeBytes }}</span><i ng-if="!tm.metrics['write-bytes-complete']" aria-hidden="true" class="fa fa-spinner fa-spin fa-fw"></i></td>
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
index 94614d8..7567ec0 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
@@ -47,10 +47,10 @@ limitations under the License.
<td>{{ manager.timeSinceLastHeartbeat | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</td>
<td>{{ manager.slotsNumber }}</td>
<td>{{ manager.freeSlots }}</td>
- <td>{{ manager.cpuCores }}</td>
- <td title="{{manager.physicalMemory}} bytes">{{ manager.physicalMemory | humanizeBytes }}</td>
- <td title="{{manager.freeMemory}} bytes">{{ manager.freeMemory | humanizeBytes }}</td>
- <td title="{{manager.managedMemory}} bytes">{{ manager.managedMemory | humanizeBytes }}</td>
+ <td>{{ manager.hardware.cpuCores }}</td>
+ <td title="{{manager.hardware.physicalMemory}} bytes">{{ manager.hardware.physicalMemory | humanizeBytes }}</td>
+ <td title="{{manager.hardware.freeMemory}} bytes">{{ manager.hardware.freeMemory | humanizeBytes }}</td>
+ <td title="{{manager.hardware.managedMemory}} bytes">{{ manager.hardware.managedMemory | humanizeBytes }}</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
index 9be77e9..db0c2bb 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
@@ -36,10 +36,10 @@ limitations under the License.
<td>{{ metrics.dataPort }}</td>
<td>{{ metrics.slotsNumber }}</td>
<td>{{ metrics.freeSlots }}</td>
- <td>{{ metrics.cpuCores }}</td>
- <td>{{ metrics.physicalMemory | humanizeBytes }}</td>
- <td>{{ metrics.freeMemory | humanizeBytes }}</td>
- <td>{{ metrics.managedMemory | humanizeBytes }}</td>
+ <td>{{ metrics.hardware.cpuCores }}</td>
+ <td>{{ metrics.hardware.physicalMemory | humanizeBytes }}</td>
+ <td>{{ metrics.hardware.freeMemory | humanizeBytes }}</td>
+ <td>{{ metrics.hardware.managedMemory | humanizeBytes }}</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
index 829f058..97f1f77 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java
@@ -229,7 +229,7 @@ public class DispatcherRestEndpoint extends RestServerEndpoint {
executionGraphCache,
executor,
checkpointStatsCache);
-
+
JobExceptionsHandler jobExceptionsHandler = new JobExceptionsHandler(
restAddressFuture,
leaderRetriever,
@@ -238,7 +238,7 @@ public class DispatcherRestEndpoint extends RestServerEndpoint {
JobExceptionsHeaders.getInstance(),
executionGraphCache,
executor);
-
+
JobVertexAccumulatorsHandler jobVertexAccumulatorsHandler = new JobVertexAccumulatorsHandler(
restAddressFuture,
leaderRetriever,
http://git-wip-us.apache.org/repos/asf/flink/blob/ac5f5b55/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
index 84c6e41..7df0545 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/TaskManagersHandler.java
@@ -25,6 +25,7 @@ import org.apache.flink.runtime.instance.Instance;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.rest.handler.legacy.metrics.MetricFetcher;
import org.apache.flink.runtime.rest.handler.legacy.metrics.MetricStore;
+import org.apache.flink.runtime.rest.messages.TaskManagerInfo;
import org.apache.flink.util.FlinkException;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
@@ -131,10 +132,13 @@ public class TaskManagersHandler extends AbstractJsonRequestHandler {
gen.writeNumberField("timeSinceLastHeartbeat", instance.getLastHeartBeat());
gen.writeNumberField("slotsNumber", instance.getTotalNumberOfSlots());
gen.writeNumberField("freeSlots", instance.getNumberOfAvailableSlots());
+
+ gen.writeObjectFieldStart(TaskManagerInfo.FIELD_NAME_HARDWARE);
gen.writeNumberField("cpuCores", instance.getResources().getNumberOfCPUCores());
gen.writeNumberField("physicalMemory", instance.getResources().getSizeOfPhysicalMemory());
gen.writeNumberField("freeMemory", instance.getResources().getSizeOfJvmHeap());
gen.writeNumberField("managedMemory", instance.getResources().getSizeOfManagedMemory());
+ gen.writeEndObject();
// only send metrics when only one task manager requests them.
if (pathParams.containsKey(TASK_MANAGER_ID_KEY)) {