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 2016/04/25 23:35:57 UTC
[16/48] mesos git commit: Fixed webui task counts for
STARTING/RUNNING tasks.
Fixed webui task counts for STARTING/RUNNING tasks.
The "Starting" and "Running" counts show the number of tasks in
"TASK_STARTING" and "TASK_RUNNING" state respectively.
Review: https://reviews.apache.org/r/42986/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1ec05167
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1ec05167
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1ec05167
Branch: refs/heads/0.27.x
Commit: 1ec0516720562480102a207323da25041b68abc0
Parents: f8f75c2
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Sun Jan 31 17:02:21 2016 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Feb 15 16:15:23 2016 -0500
----------------------------------------------------------------------
src/webui/master/static/home.html | 12 ++++++++----
src/webui/master/static/js/controllers.js | 10 ++++++----
src/webui/master/static/slave.html | 12 ++++++++----
3 files changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1ec05167/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index f6d2f7d..d6cde1e 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -60,12 +60,16 @@
<tbody>
<tr>
- <td>Staged</td>
- <td class="text-right">{{staged_tasks | number}}</td>
+ <td>Staging</td>
+ <td class="text-right">{{staging_tasks | number}}</td>
</tr>
<tr>
- <td>Started</td>
- <td class="text-right">{{started_tasks | number}}</td>
+ <td>Starting</td>
+ <td class="text-right">{{starting_tasks | number}}</td>
+ </tr>
+ <tr>
+ <td>Running</td>
+ <td class="text-right">{{running_tasks | number}}</td>
</tr>
<tr>
<td>Finished</td>
http://git-wip-us.apache.org/repos/asf/mesos/blob/1ec05167/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 36865f1..ff73a46 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -222,8 +222,9 @@
// Update the outermost scope with the metrics/snapshot endpoint.
function updateMetrics($scope, $timeout, data) {
var metrics = JSON.parse(data);
- $scope.staged_tasks = metrics['master/tasks_staging'];
- $scope.started_tasks = metrics['master/tasks_starting'];
+ $scope.staging_tasks = metrics['master/tasks_staging'];
+ $scope.starting_tasks = metrics['master/tasks_starting'];
+ $scope.running_tasks = metrics['master/tasks_running'];
$scope.finished_tasks = metrics['master/tasks_finished'];
$scope.killed_tasks = metrics['master/tasks_killed'];
$scope.failed_tasks = metrics['master/tasks_failed'];
@@ -525,8 +526,9 @@
$scope.state = {};
}
- $scope.state.staged_tasks = response['slave/tasks_staging'];
- $scope.state.started_tasks = response['slave/tasks_starting'];
+ $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.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/1ec05167/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index ad37ee2..bc46885 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -48,12 +48,16 @@
<table class="table table-condensed">
<tbody>
<tr>
- <td>Staged</td>
- <td class="text-right">{{state.staged_tasks | number}}</td>
+ <td>Staging</td>
+ <td class="text-right">{{state.staging_tasks | number}}</td>
</tr>
<tr>
- <td>Started</td>
- <td class="text-right">{{state.started_tasks | number}}</td>
+ <td>Starting</td>
+ <td class="text-right">{{state.starting_tasks | number}}</td>
+ </tr>
+ <tr>
+ <td>Running</td>
+ <td class="text-right">{{state.running_tasks | number}}</td>
</tr>
<tr>
<td>Finished</td>