Commit 261efdd6 authored by Leigh B Stoller's avatar Leigh B Stoller

Include Free node counts as determined by the reservation system.

parent 1b71a72d
......@@ -442,6 +442,11 @@ sub SliceUtilizationData($)
if (defined($counts)) {
$typelist{$typeinfo->type()}->{"total"} = $counts->{"total"};
$typelist{$typeinfo->type()}->{"free"} = $counts->{"free"};
my $reserve_free = Reservation->FreeCount($type);
if ($reserve_free) {
$typelist{$typeinfo->type()}->{"reserve_free"} = $reserve_free;
}
}
}
my $results = {"api_version" => $API_VERSION,
......@@ -477,7 +482,7 @@ sub SliceIdleData($)
my $pid = $experiment->pid();
my $eid = $experiment->eid();
my $swapped = str2time($experiment->swapin_last());
my $limit = time() - (3600 * 24 * 3);
my $limit = time() - (3600 * 24 * 6);
if ($limit < $swapped) {
$limit = $swapped;
}
......
......@@ -207,6 +207,12 @@ $(function ()
var html = summaryTemplate({"utilization" : json.value});
$("#thirdrow").html(html);
// This activates the tooltip subsystem.
$('[data-toggle="tooltip"]').tooltip({
delay: {"hide" : 500, "show" : 150},
placement: 'auto',
});
};
var xmlthing = sup.CallServerMethod(null, "status", "Utilization",
{"uuid" : window.UUID});
......
......@@ -10,7 +10,15 @@
<th>Type</th>
<th>Cluster</th>
<th>Used</th>
<th>Free</th>
<th>Free
<a href='#' class='btn btn-xs'
data-toggle='tooltip'
data-container="body"
title='Reservation system prediction in parens'
data-trigger="hover"><span
class='glyphicon glyphicon-question-sign'
style='margin-bottom: 4px;'></a></span>
</th>
<th>Total</th>
</tr>
</thead>
......@@ -21,7 +29,14 @@
<td><%- type %></td>
<td><%- name %></td>
<td><%- info.count %></td>
<td><%- info.free %></td>
<td>
<%- info.free %>
<% if (_.has(info, "reserve_free")) { %>
(<%- info.reserve_free %>)
<% } else { %>
(n/a)
<% } %>
</td>
<td><%- info.total %></td>
</tr>
<% }); %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment