shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-12 09:17:41 +03:00
Code Releases Wiki Activity

B #5489: Better scheduler messages (#1400)

Browse Source 
(cherry picked from commit f046c922a292611cf9679a2ebfddf1c641736cba)
This commit is contained in:
Pavel Czerný 2021-08-09 11:11:09 +02:00 committed by Ruben S. Montero
parent b80ee243c0
commit 766f44008a
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
3 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/scheduler/include/Resource.h
View File

@ -63,6 +63,23 @@ public:
resources.push_back(r);
}
/**
* Removes resource
* @param oid of the resource
*/
virtual void remove_resource(int oid)
{
auto it = std::find_if(resources.begin(), resources.end(), [oid](const auto val) {
return oid == val->oid;
});
if (it != resources.end())
{
delete *it;
resources.erase(it);
}
}
/**
* Sort the matched resources in the vector
*/

8
src/scheduler/include/VirtualMachinePoolXML.h
View File

@ -106,6 +106,14 @@ public:
vm_resources.sort_resources();
}
/**
* Sort the VMs in the pool
*/
void remove_vm_resources(int oid)
{
vm_resources.remove_resource(oid);
}
protected:
int get_suitable_nodes(std::vector<xmlNodePtr>& content) const override

34
src/scheduler/src/sched/Scheduler.cc
View File

@ -894,7 +894,9 @@ void Scheduler::match_schedule()
{
log_match(vm->get_oid(), "Cannot schedule VM. "+ m_error);
vm->log("Cannot schedule VM. "+ m_error);
vm->log("Cannot dispatch VM: "+ m_error);
vmpool->remove_vm_resources(vm->get_oid());
continue;
}
@ -947,17 +949,17 @@ void Scheduler::match_schedule()
{
if (hosts.size() == 0)
{
vm->log("No hosts enabled to run VMs");
vm->log("Cannot dispatch VM: No hosts enabled to run VMs");
}
else if (n_auth == 0)
{
vm->log("User is not authorized to use any host");
vm->log("Cannot dispatch VM: User is not authorized to use any host");
}
else if (n_fits == 0)
{
ostringstream oss;
oss << "No host with enough capacity to deploy the VM";
oss << "Cannot dispatch VM: No host with enough capacity to deploy the VM";
vm->log(oss.str());
}
@ -965,7 +967,7 @@ void Scheduler::match_schedule()
{
ostringstream oss;
oss << "No host meets capacity and SCHED_REQUIREMENTS: "
oss << "Cannot dispatch VM: No host meets capacity and SCHED_REQUIREMENTS: "
<< vm->get_requirements();
vm->log(oss.str());
@ -975,6 +977,8 @@ void Scheduler::match_schedule()
log_match(vm->get_oid(),
"Cannot schedule VM, there is no suitable host.");
vmpool->remove_vm_resources(vm->get_oid());
continue;
}
@ -1060,16 +1064,16 @@ void Scheduler::match_schedule()
{
if (datastores.size() == 0)
{
vm->log("No system datastores found to run VMs");
vm->log("Cannot dispatch VM: No system datastores found to run VMs");
}
else if (n_auth == 0)
{
vm->log("User is not authorized to use any system datastore");
vm->log("Cannot dispatch VM: User is not authorized to use any system datastore");
}
else if (n_fits == 0)
{
ostringstream oss;
oss << "No system datastore with enough capacity for the VM";
oss << "Cannot dispatch VM: No system datastore with enough capacity for the VM";
vm->log(oss.str());
}
@ -1077,7 +1081,7 @@ void Scheduler::match_schedule()
{
ostringstream oss;
oss << "No system datastore meets capacity "
oss << "Cannot dispatch VM: No system datastore meets capacity "
<< "and SCHED_DS_REQUIREMENTS: "
<< vm->get_ds_requirements();
@ -1090,6 +1094,8 @@ void Scheduler::match_schedule()
log_match(vm->get_oid(), "Cannot schedule VM, there is no suitable "
"system ds.");
vmpool->remove_vm_resources(vm->get_oid());
continue;
}
}
@ -1164,21 +1170,21 @@ void Scheduler::match_schedule()
{
if (nets.size() == 0)
{
vm->log("No networks found to run VMs");
vm->log("Cannot dispatch VM: No networks found to run VMs");
}
else if (n_auth == 0)
{
vm->log("User is not authorized to use any network");
vm->log("Cannot dispatch VM: User is not authorized to use any network");
}
else if (n_fits == 0)
{
vm->log("No network with enough capacity for the VM");
vm->log("Cannot dispatch VM: No network with enough capacity for the VM");
}
else if (n_matched == 0)
{
ostringstream oss;
oss << "No network meet leases "
oss << "Cannot dispatch VM: No network meet leases "
<< "and SCHED_NIC_REQUIREMENTS: "
<< vm->get_nic_requirements(nic_id);
@ -1192,6 +1198,8 @@ void Scheduler::match_schedule()
log_match(vm->get_oid(), "Cannot schedule VM, there is no "
"suitable network.");
vmpool->remove_vm_resources(vm->get_oid());
break;
not_matched = true;