This is an automated email from the ASF dual-hosted git repository.
grag pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new f8a3dd3 Added resource limits to the web UI.
f8a3dd3 is described below
commit f8a3dd334934094ec44e07fa350f958d218bc78f
Author: Greg Mann <[email protected]>
AuthorDate: Tue Mar 31 21:55:42 2020 -0700
Added resource limits to the web UI.
Review: https://reviews.apache.org/r/72269/
---
src/webui/app/agents/agent-executor.html | 82 +++++++++++++++++++++-----------
1 file changed, 53 insertions(+), 29 deletions(-)
diff --git a/src/webui/app/agents/agent-executor.html
b/src/webui/app/agents/agent-executor.html
index 7ec56c3..d8a5250 100644
--- a/src/webui/app/agents/agent-executor.html
+++ b/src/webui/app/agents/agent-executor.html
@@ -106,13 +106,19 @@
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="role">Role</th>
- <th data-key="resources.cpus">CPUs</th>
- <th data-key="resources.gpus">GPUs</th>
- <th data-key="resources.mem">Mem</th>
- <th data-key="resources.disk">Disk</th>
+ <th data-key="id" rowspan="2">ID</th>
+ <th data-key="name" rowspan="2">Name</th>
+ <th data-key="role" rowspan="2">Role</th>
+ <th class="group-column" colspan="2">CPUs</th>
+ <th class="group-column" colspan="2">Mem</th>
+ <th data-key="resources.gpus" rowspan="2">GPUs (allocated)</th>
+ <th data-key="resources.disk"rowspan="2">Disk (allocated)</th>
+ </tr>
+ <tr>
+ <th class="begin-group-column"
data-key="resources.cpus">Allocated</th>
+ <th class="end-group-column" data-key="limits.cpus">Limit</th>
+ <th class="begin-group-column"
data-key="resources.mem">Allocated</th>
+ <th class="end-group-column" data-key="limits.mem">Limit</th>
</tr>
</thead>
<tbody>
@@ -121,8 +127,10 @@
<td>{{queued_task.name}}</td>
<td>{{queued_task.role}}</td>
<td>{{queued_task.resources.cpus | number}}</td>
- <td>{{queued_task.resources.gpus | number}}</td>
+ <td>{{queued_task.limits.cpus | number}}</td>
<td>{{queued_task.resources.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{queued_task.limits.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{queued_task.resources.gpus | number}}</td>
<td>{{queued_task.resources.disk * (1024 * 1024) | dataSize}}</td>
</tr>
</tbody>
@@ -132,16 +140,22 @@
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="role">Role</th>
- <th data-key="state">State</th>
- <th data-key="healthy">Health</th>
- <th data-key="resources.cpus">CPUs (allocated)</th>
- <th data-key="resources.gpus">GPUs (allocated)</th>
- <th data-key="resources.mem">Mem (allocated)</th>
- <th data-key="resources.disk">Disk (allocated)</th>
- <th></th>
+ <th data-key="id" rowspan="2">ID</th>
+ <th data-key="name" rowspan="2">Name</th>
+ <th data-key="role" rowspan="2">Role</th>
+ <th data-key="state" rowspan="2">State</th>
+ <th data-key="healthy" rowspan="2">Health</th>
+ <th class="group-column" colspan="2">CPUs</th>
+ <th class="group-column" colspan="2">Mem</th>
+ <th data-key="resources.gpus" rowspan="2">GPUs (allocated)</th>
+ <th data-key="resources.disk" rowspan="2">Disk (allocated)</th>
+ <th rowspan="2"></th>
+ </tr>
+ <tr>
+ <th class="begin-group-column"
data-key="resources.cpus">Allocated</th>
+ <th class="end-group-column" data-key="limits.cpus">Limit</th>
+ <th class="begin-group-column"
data-key="resources.mem">Allocated</th>
+ <th class="end-group-column" data-key="limits.mem">Limit</th>
</tr>
</thead>
<tbody>
@@ -152,8 +166,10 @@
<td>{{task.state}}</td>
<td class="task-{{task.healthy | taskHealth}}">{{task.healthy |
taskHealth}}</td>
<td>{{task.resources.cpus | number}}</td>
- <td>{{task.resources.gpus | number}}</td>
+ <td>{{task.limits.cpus | number}}</td>
<td>{{task.resources.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{task.limits.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{task.resources.gpus | number}}</td>
<td>{{task.resources.disk * (1024 * 1024) | dataSize}}</td>
<td>
<a href="{{'#/agents/' + agent_id + '/browse?path=' +
@@ -169,15 +185,21 @@
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="role">Role</th>
- <th data-key="state">State</th>
- <th data-key="resources.cpus">CPUs (allocated)</th>
- <th data-key="resources.gpus">GPUs (allocated)</th>
- <th data-key="resources.mem">Mem (allocated)</th>
- <th data-key="resources.disk">Disk (allocated)</th>
- <th></th>
+ <th data-key="id" rowspan="2">ID</th>
+ <th data-key="name" rowspan="2">Name</th>
+ <th data-key="role" rowspan="2">Role</th>
+ <th data-key="state" rowspan="2">State</th>
+ <th class="group-column" colspan="2">CPUs</th>
+ <th class="group-column" colspan="2">Mem</th>
+ <th data-key="resources.gpus" rowspan="2">GPUs (allocated)</th>
+ <th data-key="resources.disk" rowspan="2">Disk (allocated)</th>
+ <th rowspan="2"></th>
+ </tr>
+ <tr>
+ <th class="begin-group-column"
data-key="resources.cpus">Allocated</th>
+ <th class="end-group-column" data-key="limits.cpus">Limit</th>
+ <th class="begin-group-column"
data-key="resources.mem">Allocated</th>
+ <th class="end-group-column" data-key="limits.mem">Limit</th>
</tr>
</thead>
<tbody>
@@ -187,8 +209,10 @@
<td>{{completed_task.role}}</td>
<td>{{completed_task.state}}</td>
<td>{{completed_task.resources.cpus | number}}</td>
- <td>{{completed_task.resources.gpus | number}}</td>
+ <td>{{completed_task.limits.cpus | number}}</td>
<td>{{completed_task.resources.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{completed_task.limits.mem * (1024 * 1024) | dataSize}}</td>
+ <td>{{completed_task.resources.gpus | number}}</td>
<td>{{completed_task.resources.disk * (1024 * 1024) | dataSize}}</td>
<td>
<a href="{{'#/agents/' + agent_id + '/browse?path=' +
