You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/02/23 19:09:16 UTC
mesos git commit: Updated webui to reflect the new TASK_KILLING state.
Repository: mesos
Updated Branches:
refs/heads/master 8b5137ddb -> b1092b005
Updated webui to reflect the new TASK_KILLING state.
Review: https://reviews.apache.org/r/43888
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1092b00
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1092b00
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1092b00
Branch: refs/heads/master
Commit: b1092b005b03d231b18806679a8e1d58a09f3004
Parents: 8b5137d
Author: Benjamin Mahler <bm...@apache.org>
Authored: Mon Feb 22 10:03:30 2016 +0100
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Feb 23 10:01:57 2016 -0800
----------------------------------------------------------------------
src/webui/master/static/home.html | 4 ++++
src/webui/master/static/js/controllers.js | 2 ++
src/webui/master/static/slave.html | 4 ++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1092b00/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index ad3f092..a691084 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -72,6 +72,10 @@
<td class="text-right">{{running_tasks | number}}</td>
</tr>
<tr>
+ <td>Killing</td>
+ <td class="text-right">{{killing_tasks | number}}</td>
+ </tr>
+ <tr>
<td>Finished</td>
<td class="text-right">{{finished_tasks | number}}</td>
</tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1092b00/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 ff73a46..56a44fc 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -225,6 +225,7 @@
$scope.staging_tasks = metrics['master/tasks_staging'];
$scope.starting_tasks = metrics['master/tasks_starting'];
$scope.running_tasks = metrics['master/tasks_running'];
+ $scope.killing_tasks = metrics['master/tasks_killing'];
$scope.finished_tasks = metrics['master/tasks_finished'];
$scope.killed_tasks = metrics['master/tasks_killed'];
$scope.failed_tasks = metrics['master/tasks_failed'];
@@ -529,6 +530,7 @@
$scope.state.staging_tasks = response['slave/tasks_staging'];
$scope.state.starting_tasks = response['slave/tasks_starting'];
$scope.state.running_tasks = response['slave/tasks_running'];
+ $scope.state.killing_tasks = response['slave/tasks_killing'];
$scope.state.finished_tasks = response['slave/tasks_finished'];
$scope.state.killed_tasks = response['slave/tasks_killed'];
$scope.state.failed_tasks = response['slave/tasks_failed'];
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1092b00/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index 4735d66..3707d31 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -60,6 +60,10 @@
<td class="text-right">{{state.running_tasks | number}}</td>
</tr>
<tr>
+ <td>Killing</td>
+ <td class="text-right">{{state.killing_tasks | number}}</td>
+ </tr>
+ <tr>
<td>Finished</td>
<td class="text-right">{{state.finished_tasks | number}}</td>
</tr>