shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Revert "F #1439: Added new attributes to set maximum values (#2060)" (#2062)

Browse Source 
This reverts commit f42f43b6a2.
This commit is contained in:
Ruben S. Montero 2018-05-05 23:54:49 +02:00 committed by GitHub
parent f42f43b6a2
commit 08acf5bd0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/doc/xsd/oned.conf
View File

@ -775,17 +775,11 @@ VM_RESTRICTED_ATTR = "NIC_DEFAULT/BRIDGE"
#VM_RESTRICTED_ATTR = "NIC/VCENTER_NET_REF"
#VM_RESTRICTED_ATTR = "NIC/VCENTER_PORTGROUP_TYPE"
VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC_MAX"
VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC_MAX"
#VM_RESTRICTED_ATTR = "DISK/OPENNEBULA_MANAGED"
#VM_RESTRICTED_ATTR = "DISK/VCENTER_DS_REF"
#VM_RESTRICTED_ATTR = "DISK/VCENTER_INSTANCE_ID"

6
share/etc/oned.conf
View File

@ -998,17 +998,11 @@ VM_RESTRICTED_ATTR = "NIC_DEFAULT/MAC"
VM_RESTRICTED_ATTR = "NIC_DEFAULT/VLAN_ID"
VM_RESTRICTED_ATTR = "NIC_DEFAULT/BRIDGE"
VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC"
VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC_MAX"
VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC_MAX_LENGTH"
VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC"
VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC_MAX"
VM_RESTRICTED_ATTR = "DISK/OPENNEBULA_MANAGED"
VM_RESTRICTED_ATTR = "DISK/VCENTER_DS_REF"
VM_RESTRICTED_ATTR = "DISK/VCENTER_INSTANCE_ID"

20
src/mad/sh/scripts_common.sh
View File

@ -690,17 +690,11 @@ function get_source_xml {
# * DISK_IO
# * ORDER
# * TOTAL_BYTES_SEC
# * TOTAL_BYTES_SEC_MAX_LENGTH
# * READ_BYTES_SEC
# * READ_BYTES_SEC_MAX_LENGTH
# * WRITE_BYTES_SEC
# * WRITE_BYTES_SEC_MAX
# * TOTAL_IOPS_SEC
# * TOTAL_IOPS_SEC_MAX_LENGTH
# * READ_IOPS_SEC
# * READ_IOPS_SEC_MAX_LENGTH
# * WRITE_IOPS_SEC
# * WRITE_IOPS_SEC_MAX
# * TYPE_SOURCE: libvirt xml source name. $TYPE_SOURCE=$SOURCE => file=/my/path
# * SOURCE: disk source, can be path, ceph pool/image, device...
# * TYPE_XML
@ -747,17 +741,11 @@ function get_disk_information {
$DISK_XPATH/IO \
$DISK_XPATH/ORDER \
$DISK_XPATH/TOTAL_BYTES_SEC \
$DISK_XPATH/TOTAL_BYTES_SEC_MAX_LENGTH \
$DISK_XPATH/READ_BYTES_SEC \
$DISK_XPATH/READ_BYTES_SEC_MAX_LENGTH \
$DISK_XPATH/WRITE_BYTES_SEC \
$DISK_XPATH/WRITE_BYTES_SEC_MAX \
$DISK_XPATH/TOTAL_IOPS_SEC \
$DISK_XPATH/TOTAL_IOPS_SEC_MAX_LENGTH \
$DISK_XPATH/READ_IOPS_SEC \
$DISK_XPATH/READ_IOPS_SEC_MAX_LENGTH \
$DISK_XPATH/WRITE_IOPS_SEC \
$DISK_XPATH/WRITE_IOPS_SEC_MAX )
$DISK_XPATH/WRITE_IOPS_SEC)
VMID="${XPATH_ELEMENTS[j++]}"
DRIVER="${XPATH_ELEMENTS[j++]:-$DEFAULT_TYPE}"
@ -782,17 +770,11 @@ function get_disk_information {
DISK_IO="${XPATH_ELEMENTS[j++]}"
ORDER="${XPATH_ELEMENTS[j++]}"
TOTAL_BYTES_SEC="${XPATH_ELEMENTS[j++]}"
TOTAL_BYTES_SEC_MAX_LENGTH="${XPATH_ELEMENTS[j++]}"
READ_BYTES_SEC="${XPATH_ELEMENTS[j++]}"
READ_BYTES_SEC_MAX_LENGTH="${XPATH_ELEMENTS[j++]}"
WRITE_BYTES_SEC="${XPATH_ELEMENTS[j++]}"
WRITE_BYTES_SEC_MAX="${XPATH_ELEMENTS[j++]}"
TOTAL_IOPS_SEC="${XPATH_ELEMENTS[j++]}"
TOTAL_IOPS_SEC_MAX_LENGTH="${XPATH_ELEMENTS[j++]}"
READ_IOPS_SEC="${XPATH_ELEMENTS[j++]}"
READ_IOPS_SEC_MAX_LENGTH="${XPATH_ELEMENTS[j++]}"
WRITE_IOPS_SEC="${XPATH_ELEMENTS[j++]}"
WRITE_IOPS_SEC_MAX="${XPATH_ELEMENTS[j++]}"
TYPE=$(echo "$TYPE"|tr A-Z a-z)
READONLY=$(echo "$READONLY"|tr A-Z a-z)

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

@ -144,25 +144,6 @@
<input wizard_field="WRITE_BYTES_SEC" type="number" min="0" id="WRITE_BYTES_SEC" name="WRITE_BYTES_SEC" />
</fieldset>
</div>
<div class="medium-6 columns hypervisor only_kvm">
<fieldset>
<legend>{{tr "Max IO throttling (bytes/s)"}}</legend>
<label for="TOTAL_BYTES_SEC_MAX_LENGTH">
{{tr "Maximum total (read+write) bytes/s"}}
</label>
<input wizard_field="TOTAL_BYTES_SEC_MAX_LENGTH" type="number" min="0" id="TOTAL_BYTES_SEC_MAX_LENGTH" name="TOTAL_BYTES_SEC_MAX_LENGTH" />
<label for="READ_BYTES_SEC_MAX_LENGTH">
{{tr "Maximum read bytes/s"}}
</label>
<input wizard_field="READ_BYTES_SEC_MAX_LENGTH" type="number" min="0" id="READ_BYTES_SEC_MAX_LENGTH" name="READ_BYTES_SEC_MAX_LENGTH" />
<label for="WRITE_BYTES_SEC">
{{tr "Maximum write bytes/s"}}
</label>
<input wizard_field="WRITE_BYTES_SEC_MAX" type="number" min="0" id="WRITE_BYTES_SEC_MAX" name="WRITE_BYTES_SEC_MAX" />
</fieldset>
</div>
</div>
<div class="row vm_param">
<div class="medium-6 columns hypervisor only_kvm">
<fieldset>
<legend>{{tr "IO throttling (IOPS)"}}</legend>
@ -180,21 +161,4 @@
<input wizard_field="WRITE_IOPS_SEC" type="number" min="0" id="WRITE_IOPS_SEC" name="WRITE_IOPS_SEC" />
</fieldset>
</div>
<div class="medium-6 columns hypervisor only_kvm">
<fieldset>
<legend>{{tr "Max IO throttling (IOPS)"}}</legend>
<label for="TOTAL_IOPS_SEC_MAX_LENGTH">
{{tr "Maximum total (read+write) IOPS"}}
</label>
<input wizard_field="TOTAL_IOPS_SEC_MAX_LENGTH" type="number" min="0" id="TOTAL_IOPS_SEC_MAX_LENGTH" name="TOTAL_IOPS_SEC_MAX_LENGTH" />
<label for="READ_IOPS_SEC_MAX_LENGTH">
{{tr "Maximum read IOPS"}}
</label>
<input wizard_field="READ_IOPS_SEC_MAX_LENGTH" type="number" min="0" id="READ_IOPS_SEC_MAX_LENGTH" name="READ_IOPS_SEC_MAX_LENGTH" />
<label for="WRITE_IOPS_SEC_MAX">
{{tr "Maximum write IOPS Sec"}}
</label>
<input wizard_field="WRITE_IOPS_SEC_MAX" type="number" min="0" id="WRITE_IOPS_SEC_MAX" name="WRITE_IOPS_SEC_MAX" />
</fieldset>
</div>
</div>

138
src/vmm/LibVirtDriverKVM.cc
View File

@ -142,31 +142,19 @@ int LibVirtDriver::deployment_description_kvm(
string gluster_host = "";
string gluster_volume = "";
string total_bytes_sec = "";
string total_bytes_sec_max_length = "";
string read_bytes_sec = "";
string read_bytes_sec_max_length = "";
string write_bytes_sec = "";
string write_bytes_sec_max = "";
string total_iops_sec = "";
string total_iops_sec_max_length = "";
string read_iops_sec = "";
string read_iops_sec_max_length = "";
string write_iops_sec = "";
string write_iops_sec_max = "";
string total_bytes_sec = "";
string read_bytes_sec = "";
string write_bytes_sec = "";
string total_iops_sec = "";
string read_iops_sec = "";
string write_iops_sec = "";
string default_total_bytes_sec = "";
string default_total_bytes_sec_max_length = "";
string default_read_bytes_sec = "";
string default_read_bytes_sec_max_length = "";
string default_write_bytes_sec = "";
string default_write_bytes_sec_max = "";
string default_total_iops_sec = "";
string default_total_iops_sec_max_length = "";
string default_read_iops_sec = "";
string default_read_iops_sec_max_length = "";
string default_write_iops_sec = "";
string default_write_iops_sec_max = "";
string default_total_bytes_sec = "";
string default_read_bytes_sec = "";
string default_write_bytes_sec = "";
string default_total_iops_sec = "";
string default_read_iops_sec = "";
string default_write_iops_sec = "";
int disk_id;
int order;
@ -474,17 +462,11 @@ int LibVirtDriver::deployment_description_kvm(
get_default("DISK", "IO", default_driver_disk_io);
get_default("DISK", "DISCARD", default_driver_discard);
get_default("DISK", "TOTAL_BYTES_SEC", default_total_bytes_sec);
get_default("DISK", "TOTAL_BYTES_SEC_MAX_LENGTH", default_total_bytes_sec_max_length);
get_default("DISK", "READ_BYTES_SEC", default_read_bytes_sec);
get_default("DISK", "READ_BYTES_SEC_MAX_LENGTH", default_read_bytes_sec_max_length);
get_default("DISK", "WRITE_BYTES_SEC", default_write_bytes_sec);
get_default("DISK", "WRITE_BYTES_SEC_MAX", default_write_bytes_sec_max);
get_default("DISK", "TOTAL_IOPS_SEC", default_total_iops_sec);
get_default("DISK", "TOTAL_IOPS_SEC_MAX_LENGTH", default_total_iops_sec_max_length);
get_default("DISK", "READ_IOPS_SEC", default_read_iops_sec);
get_default("DISK", "READ_IOPS_SEC_MAX_LENGTH", default_read_iops_sec_max_length);
get_default("DISK", "WRITE_IOPS_SEC", default_write_iops_sec);
get_default("DISK", "WRITE_IOPS_SEC_MAX", default_write_iops_sec_max);
// ------------------------------------------------------------------------
@ -518,78 +500,42 @@ int LibVirtDriver::deployment_description_kvm(
sheepdog_host = disk[i]->vector_value("SHEEPDOG_HOST");
total_bytes_sec = disk[i]->vector_value("TOTAL_BYTES_SEC");
total_bytes_sec_max_length = disk[i]->vector_value("TOTAL_BYTES_SEC_MAX_LENGTH");
read_bytes_sec = disk[i]->vector_value("READ_BYTES_SEC");
read_bytes_sec_max_length = disk[i]->vector_value("READ_BYTES_SEC_MAX_LENGTH");
write_bytes_sec = disk[i]->vector_value("WRITE_BYTES_SEC");
write_bytes_sec_max = disk[i]->vector_value("WRITE_BYTES_SEC_MAX");
total_iops_sec = disk[i]->vector_value("TOTAL_IOPS_SEC");
total_iops_sec_max_length = disk[i]->vector_value("TOTAL_IOPS_SEC_MAX_LENGTH");
read_iops_sec = disk[i]->vector_value("READ_IOPS_SEC");
read_iops_sec_max_length = disk[i]->vector_value("READ_IOPS_SEC_MAX_LENGTH");
write_iops_sec = disk[i]->vector_value("WRITE_IOPS_SEC");
write_iops_sec_max = disk[i]->vector_value("WRITE_IOPS_SEC_MAX");
read_bytes_sec = disk[i]->vector_value("READ_BYTES_SEC");
write_bytes_sec = disk[i]->vector_value("WRITE_BYTES_SEC");
total_iops_sec = disk[i]->vector_value("TOTAL_IOPS_SEC");
read_iops_sec = disk[i]->vector_value("READ_IOPS_SEC");
write_iops_sec = disk[i]->vector_value("WRITE_IOPS_SEC");
if ( total_bytes_sec.empty() && !default_total_bytes_sec.empty())
{
total_bytes_sec = default_total_bytes_sec;
}
if ( total_bytes_sec_max_length.empty() && !default_total_bytes_sec_max_length.empty())
{
total_bytes_sec_max_length = default_total_bytes_sec_max_length;
}
if ( read_bytes_sec.empty() && !default_read_bytes_sec.empty())
{
read_bytes_sec = default_read_bytes_sec;
}
if ( read_bytes_sec_max_length.empty() && !default_read_bytes_sec_max_length.empty())
{
read_bytes_sec_max_length = default_read_bytes_sec_max_length;
}
if ( write_bytes_sec.empty() && !default_write_bytes_sec.empty())
{
write_bytes_sec = default_write_bytes_sec;
}
if ( write_bytes_sec_max.empty() && !default_write_bytes_sec_max.empty())
{
write_bytes_sec_max = default_write_bytes_sec_max;
}
if ( total_iops_sec.empty() && !default_total_iops_sec.empty())
{
total_iops_sec = default_total_iops_sec;
}
if ( total_iops_sec_max_length.empty() && !default_total_iops_sec_max_length.empty())
{
total_iops_sec_max_length = default_total_iops_sec_max_length;
}
if ( read_iops_sec.empty() && !default_read_iops_sec.empty())
{
read_iops_sec = default_read_iops_sec;
}
if ( read_iops_sec_max_length.empty() && !default_read_iops_sec_max_length.empty())
{
read_iops_sec_max_length = default_read_iops_sec_max_length;
}
if ( write_iops_sec.empty() && !default_write_iops_sec.empty())
{
write_iops_sec = default_write_iops_sec;
}
if ( write_iops_sec_max.empty() && !default_write_iops_sec_max.empty())
{
write_iops_sec_max = default_write_iops_sec_max;
}
disk[i]->vector_value_str("DISK_ID", disk_id);
if (target.empty())
@ -846,13 +792,7 @@ int LibVirtDriver::deployment_description_kvm(
if (!(total_bytes_sec.empty() && read_bytes_sec.empty() &&
write_bytes_sec.empty() && total_iops_sec.empty() &&
read_iops_sec.empty() && write_iops_sec.empty() &&
total_bytes_sec_max_length.empty() &&
read_bytes_sec_max_length.empty() &&
write_bytes_sec_max.empty() &&
total_iops_sec_max_length.empty() &&
read_iops_sec_max_length.empty() &&
write_iops_sec_max.empty() ))
read_iops_sec.empty() && write_iops_sec.empty()))
{
file << "\t\t\t<iotune>" << endl;
@ -863,13 +803,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</total_bytes_sec>\n";
}
if ( !total_bytes_sec_max_length.empty() )
{
file << "\t\t\t\t<total_bytes_sec_max_length>"
<< one_util::escape_xml(total_bytes_sec_max_length)
<< "</total_bytes_sec_max_length>\n";
}
if ( !read_bytes_sec.empty() )
{
file << "\t\t\t\t<read_bytes_sec>"
@ -877,13 +810,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</read_bytes_sec>\n";
}
if ( !read_bytes_sec_max_length.empty() )
{
file << "\t\t\t\t<read_bytes_sec_max_length>"
<< one_util::escape_xml(read_bytes_sec_max_length)
<< "</read_bytes_sec_max_length>\n";
}
if ( !write_bytes_sec.empty() )
{
file << "\t\t\t\t<write_bytes_sec>"
@ -891,13 +817,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</write_bytes_sec>\n";
}
if ( !write_bytes_sec_max.empty() )
{
file << "\t\t\t\t<write_bytes_sec_max>"
<< one_util::escape_xml(write_bytes_sec_max)
<< "</write_bytes_sec_max>\n";
}
if ( !total_iops_sec.empty() )
{
file << "\t\t\t\t<total_iops_sec>"
@ -905,13 +824,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</total_iops_sec>\n";
}
if ( !total_iops_sec_max_length.empty() )
{
file << "\t\t\t\t<total_iops_sec_max_length>"
<< one_util::escape_xml(total_iops_sec_max_length)
<< "</total_iops_sec_max_length>\n";
}
if ( !read_iops_sec.empty() )
{
file << "\t\t\t\t<read_iops_sec>"
@ -919,13 +831,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</read_iops_sec>\n";
}
if ( !read_iops_sec_max_length.empty() )
{
file << "\t\t\t\t<read_iops_sec_max_length>"
<< one_util::escape_xml(read_iops_sec_max_length)
<< "</read_iops_sec_max_length>\n";
}
if ( !write_iops_sec.empty() )
{
file << "\t\t\t\t<write_iops_sec>"
@ -933,13 +838,6 @@ int LibVirtDriver::deployment_description_kvm(
<< "</write_iops_sec>\n";
}
if ( !write_iops_sec_max.empty() )
{
file << "\t\t\t\t<write_iops_sec_max>"
<< one_util::escape_xml(write_iops_sec_max)
<< "</write_iops_sec_max>\n";
}
file << "\t\t\t</iotune>" << endl;
}

6
src/vmm_mad/remotes/kvm/attach_disk
View File

@ -35,17 +35,11 @@ CACHE=${CACHE:-default} # https://github.com/OpenNebula/one/blob/c0d081917224f1
DISCARD=${DISCARD:-${DEFAULT_ATTACH_DISCARD}}
DISK_IO=${DISK_IO:-${DEFAULT_ATTACH_IO}}
TOTAL_BYTES_SEC=${TOTAL_BYTES_SEC:-${DEFAULT_ATTACH_TOTAL_BYTES_SEC}}
TOTAL_BYTES_SEC_MAX_LENGTH=${TOTAL_BYTES_SEC_MAX_LENGTH:-${DEFAULT_ATTACH_TOTAL_BYTES_SEC_MAX_LENGTH}}
READ_BYTES_SEC=${READ_BYTES_SEC:-${DEFAULT_ATTACH_READ_BYTES_SEC}}
READ_BYTES_SEC_MAX_LENGTH=${READ_BYTES_SEC_MAX_LENGTH:-${DEFAULT_ATTACH_READ_BYTES_SEC_MAX_LENGTH}}
WRITE_BYTES_SEC=${WRITE_BYTES_SEC:-${DEFAULT_ATTACH_WRITE_BYTES_SEC}}
WRITE_BYTES_SEC_MAX=${WRITE_BYTES_SEC_MAX:-${DEFAULT_ATTACH_WRITE_BYTES_SEC_MAX}}
TOTAL_IOPS_SEC=${TOTAL_IOPS_SEC:-${DEFAULT_ATTACH_TOTAL_IOPS_SEC}}
TOTAL_IOPS_SEC_MAX_LENGTH=${TOTAL_IOPS_SEC_MAX_LENGTH:-${DEFAULT_ATTACH_TOTAL_IOPS_SEC_MAX_LENGTH}}
READ_IOPS_SEC=${READ_IOPS_SEC:-${DEFAULT_ATTACH_READ_IOPS_SEC}}
READ_IOPS_SEC_MAX_LENGTH=${READ_IOPS_SEC_MAX_LENGTH:-${DEFAULT_ATTACH_READ_IOPS_SEC_MAX_LENGTH}}
WRITE_IOPS_SEC=${WRITE_IOPS_SEC:-${DEFAULT_ATTACH_WRITE_IOPS_SEC}}
WRITE_IOPS_SEC_MAX=${WRITE_IOPS_SEC_MAX:-${DEFAULT_ATTACH_WRITE_IOPS_SEC_MAX}}
# disk XML
XML=''

6
src/vmm_mad/remotes/kvm/kvmrc
View File

@ -52,17 +52,11 @@ export SHUTDOWN_TIMEOUT=300
# These parameters set the default DISK I/O throttling attributes
# for the new attached disk in case they aren't set.
#DEFAULT_ATTACH_TOTAL_BYTES_SEC=
#DEFAULT_ATTACH_TOTAL_BYTES_SEC_MAX_LENGTH=
#DEFAULT_ATTACH_READ_BYTES_SEC=
#DEFAULT_ATTACH_READ_BYTES_SEC_MAX_LENGTH=
#DEFAULT_ATTACH_WRITE_BYTES_SEC=
#DEFAULT_ATTACH_WRITE_BYTES_SEC_MAX=
#DEFAULT_ATTACH_TOTAL_IOPS_SEC=
#DEFAULT_ATTACH_TOTAL_IOPS_SEC_MAX_LENGTH=
#DEFAULT_ATTACH_READ_IOPS_SEC=
#DEFAULT_ATTACH_READ_IOPS_SEC_MAX_LENGTH=
#DEFAULT_ATTACH_WRITE_IOPS_SEC=
#DEFAULT_ATTACH_WRITE_IOPS_SEC_MAX=
# This parameters will set the default NIC model and filter for
# the hot-attached interfaces.