You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/31 18:41:53 UTC
[03/10] mesos git commit: Removed orphaned tasks from webui.
Removed orphaned tasks from webui.
Now that 0.x agents are not allowed to register with the master, orphan
tasks should no longer be possible.
Review: https://reviews.apache.org/r/59215
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3ec2d1fc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3ec2d1fc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3ec2d1fc
Branch: refs/heads/master
Commit: 3ec2d1fcc115ece66a43eec8b659e61744e9ab16
Parents: ba8c824
Author: Neil Conway <ne...@gmail.com>
Authored: Thu May 11 15:51:36 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Wed May 31 11:40:24 2017 -0700
----------------------------------------------------------------------
src/webui/master/static/home.html | 57 --------------------------
src/webui/master/static/js/controllers.js | 4 --
2 files changed, 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ec2d1fc/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index 386934f..08db378 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -104,11 +104,6 @@
<td>Lost</td>
<td class="text-right">{{lost_tasks | number}}</td>
</tr>
- <tr>
- <td>Orphan</td>
- <!-- TODO(janisz) Use metrics when MESOS-5648 gets resolved -->
- <td class="text-right">{{orphan_tasks.length | number}}</td>
- </tr>
</tbody>
</table>
@@ -297,57 +292,5 @@
</tr>
</tbody>
</table>
-
- <table m-table table-content="orphan_tasks" title="Orphan 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="role">Role</th>
- <th data-key="state">State</th>
- <th data-key="start_time" data-sort>Started</th>
- <th data-key="finish_time">Stopped</th>
- <th data-key="host">Host</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr data-ng-if="orphan_tasks.length === 0">
- <td colspan="8">No orphan tasks.</td>
- </tr>
- <tr ng-repeat="task in $data">
- <td>{{task.framework_id}}</td>
- <td>{{task.id}}</td>
- <td>{{task.name}}</td>
- <td>{{task.role}}</td>
- <td>{{task.state | truncateMesosState}}</td>
- <td>
- <m-timestamp value="{{task.start_time}}"></m-timestamp>
- </td>
- <td>
- <m-timestamp value="{{task.finish_time}}"></m-timestamp>
- </td>
- <td>
- <a data-ng-show="_.has(agents, task.slave_id)"
- href="#/agents/{{task.slave_id}}/frameworks/{{task.framework_id}}/executors/{{task.executor_id}}">
- {{agents[task.slave_id].hostname}}
- </a>
- <span class="text-muted" data-ng-show="!_.has(agents, task.slave_id)">
- Agent offline
- </span>
- </td>
- <td>
- <a data-ng-show="agents[task.slave_id]" href="#/agents/{{task.slave_id}}/frameworks/{{task.framework_id}}/executors/{{task.executor_id}}/tasks/{{task.id}}/browse">
- Sandbox
- </a>
- <span class="text-muted" data-ng-show="!agents[task.slave_id]">
- Agent offline
- </span>
- </td>
- </tr>
- </tbody>
- </table>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ec2d1fc/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 a021962..1aca25a 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -115,7 +115,6 @@
$scope.active_tasks = [];
$scope.unreachable_tasks = [];
$scope.completed_tasks = [];
- $scope.orphan_tasks = [];
// Update the stats.
$scope.cluster = $scope.state.cluster;
@@ -248,9 +247,6 @@
_.each(framework.completed_tasks, setTaskMetadata);
});
- $scope.orphan_tasks = $scope.state.orphan_tasks;
- _.each($scope.orphan_tasks, setTaskMetadata);
-
$scope.used_cpus -= $scope.offered_cpus;
$scope.used_gpus -= $scope.offered_gpus;
$scope.used_mem -= $scope.offered_mem;