shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

M #~: fix overcommited (#120)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.io>
(cherry picked from commit 3a4f1d732db2796fdeb25cbbfb2d315aafc85be1)
This commit is contained in:
Jorge Miguel Lobo Escalona 2020-07-27 17:31:09 +02:00 committed by Tino Vazquez
parent 8fba7e10dd
commit 1e917cb0bf
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/sunstone/public/app/tabs/hosts-tab/panels/info.js
View File

@ -36,6 +36,7 @@ define(function(require) {
var CapacityTable = require("utils/custom-tags-table");
var EC2Tr = require("utils/panel/ec2-tr");
var OpenNebulaAction = require("opennebula/action");
var Notifier = require("utils/notifier");
/*
TEMPLATES
@ -205,23 +206,23 @@ define(function(require) {
//.off and .on prevent multiple clicks events
$(context).off("click", "#update_reserved_hosts").on("click", "#update_reserved_hosts", function(){
var positionFreeAndUsed = that && that.element && that.element.MONITORING && that.element.MONITORING.CAPACITY;
if(positionFreeAndUsed){
var CPU = that && that.element && that.element.HOST_SHARE && that.element.HOST_SHARE.TOTAL_CPU;
var MEMORY = that && that.element && that.element.MONITORING && that.element.MONITORING.CAPACITY;
if(CPU && MEMORY){
$("#update_reserved_hosts", context).prop("disabled", true);
var reservedCPU = parseInt($("#textInput_reserved_cpu_hosts", context).val());
var CPU = parseInt(positionFreeAndUsed.FREE_CPU||0);
var reservedMem = parseInt(Humanize.sizeToMB($("#textInput_reserved_mem_hosts").val()) * 1024);
var MEM = parseInt((positionFreeAndUsed.FREE_MEMORY)||0);
if (parseInt(positionFreeAndUsed.USED_CPU||0) > 0){
CPU += parseInt(positionFreeAndUsed.USED_CPU||0);
}
var CPU = parseInt(CPU||0,10);
var MEM = parseInt((MEMORY.FREE_MEMORY)||0);
reservedCPU = CPU - reservedCPU;
if (parseInt(positionFreeAndUsed.USED_MEMORY||0) > 0){
MEM += parseInt(positionFreeAndUsed.USED_MEMORY||0);
if (parseInt(MEMORY.USED_MEMORY||0) > 0){
MEM += parseInt(MEMORY.USED_MEMORY||0);
}
reservedMem = MEM - reservedMem;
var obj = { RESERVED_CPU: reservedCPU, RESERVED_MEM: reservedMem };
var obj = { RESERVED_CPU: reservedCPU, RESERVED_MEM: reservedMem };
Sunstone.runAction("Host.append_template", that.element.ID, TemplateUtils.templateToString(obj));
}
@ -232,7 +233,21 @@ define(function(require) {
$("#textInput_reserved_cpu_hosts", context).val($("#change_bar_cpu_hosts", context).val());
});
$("#textInput_reserved_cpu_hosts", context).on("input", function(){
$("#textInput_reserved_cpu_hosts", context).on("keyup", function(){
var element = $(this);
var slider = $("#change_bar_cpu_hosts", context);
var min = slider.attr("min");
var max = slider.attr("max");
if(parseInt(element.val(),10) >= parseInt(min, 10) && parseInt(element.val(),10) <= parseInt(max, 10)){
slider.prop("disabled", false);
slider.attr("value", element.val());
}else{
if(parseInt(element.val(),10) <= parseInt(min, 10)){
Notifier.notifyError(Locale.tr("it must not be a negative number"));
}
slider.attr("value", element.attr("mid"));
slider.prop("disabled", true);
}
changeInputCPU(that.element.HOST_SHARE.TOTAL_CPU);
});

2
src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs
View File

@ -95,7 +95,7 @@
<td class="key_td">{{tr "CPU"}}</td>
<td><input type="range" name="rangeInput" id="change_bar_cpu_hosts" min="0" value="{{element.HOST_SHARE.MAX_CPU}}" max="{{maxReservedCPU}}">
<label align="center">{{realCPU}}</label></td>
<td><input type="text" id="textInput_reserved_cpu_hosts" value="{{element.HOST_SHARE.MAX_CPU}}" min="0" size="1"></td>
<td><input type="number" id="textInput_reserved_cpu_hosts" value="{{element.HOST_SHARE.MAX_CPU}}" min="0" mid={{realCPU}} size="1"></td>
</tr>
<tr colspan="3">
<td class="key_td">{{tr "Memory"}}</td>