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

F #5280: Iothread id configurable on disks (#986)

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges 2021-03-17 12:51:52 +01:00 committed by GitHub
parent 2dcbfc35bf
commit a2d53a1dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 229 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js
View File

@ -18,15 +18,14 @@ define(function(require) {
/*
DEPENDENCIES
*/
var Notifier = require("utils/notifier");
var BaseFormPanel = require("utils/form-panels/form-panel");
var Sunstone = require("sunstone");
var Locale = require("utils/locale");
var Tips = require("utils/tips");
var TemplateUtils = require("utils/template-utils");
var WizardFields = require("utils/wizard-fields");
var OpenNebulaAction = require("opennebula/action");
var OpenNebulaTemplate = require("opennebula/template");
var IothreadsConf = require("./create/wizard-tabs/utils/iothreads");
/*
TEMPLATES
*/
@ -72,6 +71,9 @@ define(function(require) {
update_title = Locale.tr("Update Virtual Router VM Template");
}
this.create_title = create_title;
this.update_title = update_title;
this.actions = {
"create": {
"title": create_title,
@ -274,6 +276,14 @@ define(function(require) {
}
}
}
if (!IothreadsConf.setupVMTemplate(
templateJSON,
this.action,
this.create_title,
this.update_title)
) return false;
if (this.action == "create") {
Sunstone.runAction(this.resource+".create", {"vmtemplate": templateJSON});
return false;

4
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs
View File

@ -268,9 +268,9 @@
</label>
</div>
<div class="medium-6 columns">
<label>
<label class="features_iothreads">
{{tr "Iothreads"}}
{{{tip (tr "Number of iothreads for virtio disks. By default threads will be assign to disk by round robin algorithm. Disk thread id can be forced by disk IOTHREAD attribute")}}}
{{{tip (tr "Number of iothreads for virtio disks. By default threads will be assign to disk by round robin algorithm. Disk thread id can be forced by disk IOTHREAD attribute.")}}}
<input type="number" wizard_field="IOTHREADS">
</label>
</div>

14
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
View File

@ -255,4 +255,18 @@
</fieldset>
</div>
</div>
</fieldset>
<fieldset class="not_firecracker">
<legend>{{tr "IOTHREADS"}}</legend>
<div class="row vm_param">
<div class="medium-6 columns">
<fieldset>
<label for="IOTHREAD">
{{tr "IOTHREAD id"}}
{{{tip (tr "Iothread id used by this disk. Default is round robin. Can be used only if IOTHREADS > 0. If this input is disabled please first configure IOTHREADS value on OS & CPU -> Features.")}}}
</label>
<input wizard_field="IOTHREAD" type="number" min="0" id="IOTHREAD" name="IOTHREAD" />
</fieldset>
</div>
</div>
</fieldset>

196
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils/iothreads.js Normal file
View File

@ -0,0 +1,196 @@
/* -------------------------------------------------------------------------- */
/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
/* not use this file except in compliance with the License. You may obtain */
/* a copy of the License at */
/* */
/* http://www.apache.org/licenses/LICENSE-2.0 */
/* */
/* Unless required by applicable law or agreed to in writing, software */
/* distributed under the License is distributed on an "AS IS" BASIS, */
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
/* See the License for the specific language governing permissions and */
/* limitations under the License. */
/* -------------------------------------------------------------------------- */
define(function(require) {
var Notifier = require("utils/notifier");
/*
CONSTRUCTOR
*/
return {
'setupVMTemplate': _setupVMTemplate,
'setupAttachDisk': _setupAttachDisk,
};
/*
FUNCTIONS
*/
/**
* Convert first letter to upper case
* @param {string} string
*/
function capitalize (string) {
return string[0].toUpperCase() + string.slice(1)
}
/**
* Function to set an error with the iothread attribute of the given disk in the VMTemplate context.
* @param {string} diskId Id of the disk which has the wrong value of iothreads.
* @param {string} diskType Type of the disk which the wrong value ofiothreads.
*/
function _setErrorDiskVMTemplate (diskId, diskType) {
$('div[diskid="' + diskId + '"] div.' + diskType + ' input[name="IOTHREAD"]').addClass('is-invalid-input');
$('div[diskid="' + diskId + '"] div.' + diskType + ' label[for="IOTHREAD"]').addClass('is-invalid-label');
}
/**
* Function to unset an error with the iothread attribute of the given disk in the VMTemplate context.
* @param {string} diskId Id of the disk which has the wrong value of iothreads.
* @param {string} diskType Type of the disk which the wrong value ofiothreads.
*/
function _unsetErrorDiskVMTemplate (diskId, diskType) {
$('div[diskid="' + diskId + '"] div.' + diskType + ' input[name="IOTHREAD"]').removeClass('is-invalid-input');
$('div[diskid="' + diskId + '"] div.' + diskType + ' label[for="IOTHREAD"]').removeClass('is-invalid-label');
}
/**
* Function to set an error with the iothreads attribute on the features section in the VMTemplate context.
*/
function _setErrorFeaturesIothreads () {
$('#tabs-bootos input[wizard_field="IOTHREADS"]').addClass('is-invalid-input');
$('#tabs-bootos label.features_iothreads').addClass('is-invalid-label');
}
/**
* Function to unset an error with the iothreads attribute on the features section in the VMTemplate context.
*/
function _unsetErrorFeaturesIothreads () {
$('#tabs-bootos input[wizard_field="IOTHREADS"]').removeClass('is-invalid-input');
$('#tabs-bootos label.features_iothreads').removeClass('is-invalid-label');
}
/**
* Function to read the actual value from OS & CPU -> Features -> Iothreads
* If it's not configured iothreads = 0;
* @param {JSON} templateJSON Current VM template
* @returns Max iothread configurable value.
*/
function _getMaxIothreads (templateJSON) {
var iothreads = 0;
if (templateJSON &&
templateJSON.FEATURES &&
templateJSON.FEATURES.IOTHREADS){
iothreads = parseInt(templateJSON.FEATURES.IOTHREADS, 10);
}
return iothreads;
}
/**
* Function to take all disks from the template.
* @param {JSON} templateJSON
* @returns JSON with all the VM disks.
*/
function _getDisks (templateJSON) {
var disks = templateJSON.DISK || [];
if (templateJSON && templateJSON.DISK && !templateJSON.DISK instanceof Array){
disks = [templateJSON.DISK]
}
return disks;
}
/**
* Validate if all disks have correctly set an iothread value
* between 0 and iothreads-1.
* @param {int} iothreads Maximun number of iothreads.
* @param {Array} disks Array with disks templates for this VM template.
* @returns Array with disks templates with errors in IOTHREAD.
*/
function _checkDisksVMTemplate (iothreads, disks) {
var disksWithError = [];
disks.forEach(function (element, index) {
var diskId = index + 1;
var diskType;
if (element && element.IOTHREAD && (element.IOTHREAD >= iothreads || element.IOTHREAD < 0)){
disksWithError.push(index);
_setErrorDiskVMTemplate(diskId.toString(10), diskType);
}
else{
_unsetErrorDiskVMTemplate(diskId.toString(10), diskType);
}
});
return disksWithError;
}
/**
* Function to notify the error with the iothreads value.
* @param {int} iothreads Maximum iothreads value.
* @param {Array} disks Disks with errors on the iothreads value.
*/
function _notifyError (iothreads, disks) {
if (iothreads === 0){
_setErrorFeaturesIothreads();
Notifier.notifyError("Maximum IOTHREADS value must be configured, please proceed to OS & CPU -> Features");
}
else{
_unsetErrorFeaturesIothreads();
var error = "Disk IOTHREAD id must be between 0 and " + (iothreads-1).toString(10) + " (maximum number of IOTHREADS configured - 1). Please check: ";
disks.forEach(function (id){
error += "Disk" + id.toString(10);
if (id != disks[disks.length-1]) error += ", ";
});
error += ".";
Notifier.notifyError(error);
}
}
/**
* Function to verify the values of the iothreads on the VMTemplate.
* @param {JSON} templateJSON Current VM template
* @returns True if everything goes well, false if there is an error.
*/
function _setupVMTemplate (templateJSON, action, create_title, update_title) {
var iothreads = _getMaxIothreads(templateJSON);
var disks = _getDisks(templateJSON);
var errorDisks = _checkDisksVMTemplate(iothreads, disks);
if (errorDisks.length > 0){
_notifyError(iothreads, errorDisks);
var button = $('#templates-tabsubmit_button > button');
button.removeAttr('disabled');
button.text(capitalize(action));
var header = $('span.sunstone-form-title');
if (action == "create")
header.text(create_title);
else
header.text(update_title);
return false;
}
return true;
}
/**
* Function to block the Iothread id input on the Attach Disk Context.
* @param {JSON} templateJSON Current VM template
*/
function _setupAttachDisk (templateJSON) {
var iothreads = _getMaxIothreads(templateJSON);
if (iothreads === 0){
$('#attachDiskVMDialogForm input[name="IOTHREAD"]').attr('disabled','disabled');
$('#attachDiskVMDialogForm input[name="IOTHREAD"]').removeAttr('max');
}else{
$('#attachDiskVMDialogForm input[name="IOTHREAD"]').removeAttr('disabled');
$('#attachDiskVMDialogForm input[name="IOTHREAD"]').attr('max', iothreads);
}
}
});

5
src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk.js
View File

@ -25,6 +25,7 @@ define(function(require) {
var Notifier = require('utils/notifier');
var Tips = require('utils/tips');
var DiskTab = require('tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab');
var IothreadsConf = require('tabs/templates-tab/form-panels/create/wizard-tabs/utils/iothreads');
var WizardFields = require('utils/wizard-fields');
/*
@ -101,6 +102,10 @@ define(function(require) {
$('.hybrid_plus_section').show();
}
if (this && this.element && this.element.TEMPLATE){
IothreadsConf.setupAttachDisk(this.element.TEMPLATE);
}
return false;
}