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

M #-: Removed unused variables

Browse Source
This commit is contained in:
Ruben S. Montero 2020-08-06 21:05:37 +02:00
parent dd5fc2d06a
commit ce38105eff
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
5 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/VirtualMachineManager.h
View File

@ -95,7 +95,6 @@ public:
VirtualMachineManager(
time_t _timer_period,
int _vm_limit,
vector<const VectorAttribute*>& _mads);
~VirtualMachineManager(){};
@ -253,11 +252,6 @@ private:
*/
time_t timer_period;
/**
* Virtual Machine polling limit
*/
int vm_limit;
/**
* Action engine for the Manager
*/

2
share/doc/xsd/opennebula_configuration.xsd
View File

@ -164,7 +164,6 @@
</xs:element>
<xs:element name="HOST_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="HOST_PER_INTERVAL" type="xs:integer" minOccurs="0" maxOccurs="1"/>
<xs:element name="IMAGE_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="IM_MAD" minOccurs="0" maxOccurs="unbounded">
@ -352,7 +351,6 @@
<xs:element name="VM_MANAGE_OPERATIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="VM_MONITORING_EXPIRATION_TIME" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="VM_PER_INTERVAL" type="xs:integer" minOccurs="0" maxOccurs="1"/>
<xs:element name="VM_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="VM_SUBMIT_ON_HOLD" minOccurs="0" maxOccurs="1">

4
src/nebula/Nebula.cc
View File

@ -896,15 +896,11 @@ void Nebula::start(bool bootstrap_only)
try
{
vector<const VectorAttribute *> vmm_mads;
int vm_limit;
nebula_configuration->get("VM_PER_INTERVAL", vm_limit);
nebula_configuration->get("VM_MAD", vmm_mads);
vmm = new VirtualMachineManager(
timer_period,
vm_limit,
vmm_mads);
}
catch (bad_alloc&)

4
src/template/OpenNebulaTemplate.cc
View File

@ -352,8 +352,6 @@ void OpenNebulaTemplate::set_conf_default()
# MONITORING_INTERVAL_DATASTORE
# MONITORING_INTERVAL_DB_UPDATE
# DS_MONITOR_VM_DISK
# HOST_PER_INTERVAL
# VM_PER_INTERVAL
# VM_MONITORING_EXPIRATION_TIME
# LISTEN_ADDRESS
# PORT
@ -369,8 +367,6 @@ void OpenNebulaTemplate::set_conf_default()
set_conf_single("MONITORING_INTERVAL_DATASTORE", "300");
set_conf_single("MONITORING_INTERVAL_DB_UPDATE", "0");
set_conf_single("DS_MONITOR_VM_DISK", "10");
set_conf_single("HOST_PER_INTERVAL", "15");
set_conf_single("VM_PER_INTERVAL", "5");
set_conf_single("VM_MONITORING_EXPIRATION_TIME", "14400");
set_conf_single("PORT", "2633");
set_conf_single("LISTEN_ADDRESS", "0.0.0.0");

8
src/vmm/VirtualMachineManager.cc
View File

@ -32,12 +32,10 @@
/* ************************************************************************** */
VirtualMachineManager::VirtualMachineManager(
time_t _timer_period,
int _vm_limit,
vector<const VectorAttribute*>& _mads):
time_t _timer_period,
vector<const VectorAttribute*>& _mads):
MadManager(_mads),
timer_period(_timer_period),
vm_limit(_vm_limit)
timer_period(_timer_period)
{
Nebula& nd = Nebula::instance();