You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2017/01/24 01:08:05 UTC
[25/25] mesos git commit: Displayed unreachable tasks in the webui.
Displayed unreachable tasks in the webui.
This commit adds:
* A count of the total number of unreachable tasks
* A list of unreachable tasks to the "home" page
* A list of unreachable tasks to the "framework" page
In all three cases, we only report unreachable tasks that the master
knows about. The master only keeps a limited-size cache of unreachable
tasks for each framework and does not attempt to preserve this
information across master failover, which means there may be unreachable
tasks that are not displayed by the webui.
Review: https://reviews.apache.org/r/55856/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3a42e4d7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3a42e4d7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3a42e4d7
Branch: refs/heads/master
Commit: 3a42e4d7fe49a8a389d4514e0aae025cff81f52b
Parents: 95aa7ff
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jan 23 17:05:37 2017 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jan 23 17:07:27 2017 -0800
----------------------------------------------------------------------
src/webui/master/static/framework.html | 22 ++++++++++++++++
src/webui/master/static/home.html | 35 ++++++++++++++++++++++++++
src/webui/master/static/js/controllers.js | 3 +++
3 files changed, 60 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3a42e4d7/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index 6297cf9..37e0b31 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -95,6 +95,28 @@
</tbody>
</table>
+ <table m-table table-content="framework.unreachable_tasks" title="Unreachable Tasks"
+ class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th data-key="id">ID</th>
+ <th data-key="name">Name</th>
+ <th data-key="start_time">Started</th>
+ <th data-key="agent_id">Agent ID</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="task in $data">
+ <td>{{task.id}}</td>
+ <td>{{task.name}}</td>
+ <td>
+ <m-timestamp value="{{task.start_time}}"></m-timestamp>
+ </td>
+ <td>{{task.slave_id}}</td>
+ </tr>
+ </tbody>
+ </table>
+
<table m-table table-content="framework.completed_tasks" title="Completed Tasks"
class="table table-striped table-bordered table-condensed">
<thead>
http://git-wip-us.apache.org/repos/asf/mesos/blob/3a42e4d7/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index 295da52..07bc848 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -81,6 +81,10 @@
<td class="text-right">{{running_tasks | number}}</td>
</tr>
<tr>
+ <td>Unreachable</td>
+ <td class="text-right">{{unreachable_tasks.length | number}}</td>
+ </tr>
+ <tr>
<td>Killing</td>
<td class="text-right">{{killing_tasks | number}}</td>
</tr>
@@ -207,6 +211,37 @@
</tbody>
</table>
+ <table m-table table-content="unreachable_tasks" title="Unreachable Tasks"
+ class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th data-key="framework_id">Framework ID</th>
+ <th data-key="id">Task ID</th>
+ <th data-key="name">Task Name</th>
+ <th data-key="start_time" data-sort>Started</th>
+ <th data-key="agent_id">Agent ID</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr data-ng-if="unreachable_tasks.length === 0">
+ <td colspan="8">No unreachable tasks.</td>
+ </tr>
+ <tr ng-repeat="task in $data">
+ <td>
+ <a href="#/frameworks/{{task.framework_id}}/">
+ {{task.framework_id}}
+ </a>
+ </td>
+ <td>{{task.id}}</td>
+ <td>{{task.name}}</td>
+ <td>
+ <m-timestamp value="{{task.start_time}}"></m-timestamp>
+ </td>
+ <td>{{task.slave_id}}</td>
+ </tr>
+ </tbody>
+ </table>
+
<table m-table table-content="completed_tasks" title="Completed Tasks"
class="table table-striped table-bordered table-condensed">
<thead>
http://git-wip-us.apache.org/repos/asf/mesos/blob/3a42e4d7/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 5e90813..78bceae 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -113,6 +113,7 @@
$scope.offers = {};
$scope.completed_frameworks = {};
$scope.active_tasks = [];
+ $scope.unreachable_tasks = [];
$scope.completed_tasks = [];
$scope.orphan_tasks = [];
@@ -222,9 +223,11 @@
// TODO(brenden): Remove this once
// https://issues.apache.org/jira/browse/MESOS-527 is fixed.
_.each(framework.tasks, setTaskMetadata);
+ _.each(framework.unreachable_tasks, setTaskMetadata);
_.each(framework.completed_tasks, setTaskMetadata);
$scope.active_tasks = $scope.active_tasks.concat(framework.tasks);
+ $scope.unreachable_tasks = $scope.unreachable_tasks.concat(framework.unreachable_tasks);
$scope.completed_tasks =
$scope.completed_tasks.concat(framework.completed_tasks);
});