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

F #4849: Add sched_message when a VM cannot be dispatched

Browse Source
This commit is contained in:
Ruben S. Montero 2016-10-06 12:00:52 +02:00
parent 07f4786114
commit 59085947bf
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scheduler/include/VirtualMachineXML.h
View File

@ -227,18 +227,6 @@ public:
bool test_image_datastore_capacity(
ImageDatastorePoolXML * img_dspool, string & error_msg) const;
/**
* Tests if the Image DS have enough free space to host the VM
* @param img_datastores Image Datastores
* @return true if the Image Datastores can host the VM
*/
bool test_image_datastore_capacity(
ImageDatastorePoolXML * img_dspool) const
{
string tmp_st;
return test_image_datastore_capacity(img_dspool, tmp_st);
}
/**
* Adds the VM disk requirements to each Image Datastore counter
* @param img_datastores Image Datastores

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

@ -795,9 +795,9 @@ void Scheduler::match_schedule()
}
else
{
log_match(vm->get_oid(), "Cannot schedule VM. "+m_error);
log_match(vm->get_oid(), "Cannot schedule VM. "+ m_error);
vm->log("Cannot schedule VM. "+m_error);
vm->log("Cannot schedule VM. "+ m_error);
vmpool->update(vm);
continue;
@ -1061,6 +1061,7 @@ void Scheduler::dispatch()
VirtualMachineXML * vm;
ostringstream dss;
string error;
int cpu, mem;
long long dsk;
@ -1069,6 +1070,7 @@ void Scheduler::dispatch()
int hid, dsid, cid;
unsigned int dispatched_vms = 0;
bool dispatched;
map<int, unsigned int> host_vms;
pair<map<int,unsigned int>::iterator, bool> rc;
@ -1091,6 +1093,8 @@ void Scheduler::dispatch()
( dispatch_limit <= 0 || dispatched_vms < dispatch_limit );
vm_it++)
{
dispatched = false;
vm = static_cast<VirtualMachineXML*>(vm_it->second);
const vector<Resource *> resources = vm->get_match_hosts();
@ -1100,7 +1104,7 @@ void Scheduler::dispatch()
//----------------------------------------------------------------------
if (!resources.empty() && !vm->is_resched() && !vm->is_resume())
{
if (vm->test_image_datastore_capacity(img_dspool) == false)
if (vm->test_image_datastore_capacity(img_dspool, error) == false)
{
if (vm->is_public_cloud())//No capacity needed for public cloud
{
@ -1108,6 +1112,10 @@ void Scheduler::dispatch()
}
else
{
vm->log("Cannot dispatch VM. " + error);
vmpool->update(vm);
continue;
}
}
@ -1275,14 +1283,25 @@ void Scheduler::dispatch()
dispatched_vms++;
dispatched = true;
break;
}
if (!dispatched)
{
vm->log("Cannot dispatch VM to any Host. Possible reasons: Not "
"enough capacity in Host or System DS, or dispatch limit "
"reached");
vmpool->update(vm);
}
}
if (vm_it != pending_vms.end())
{
dss << endl << "MAX_DISPATCH limit of " << dispatch_limit << " reached, "
<< std::distance(vm_it, pending_vms.end()) << " VMs were not dispatched";
<< std::distance(vm_it, pending_vms.end())
<< " VMs were not dispatched";
}
NebulaLog::log("SCHED", Log::DEBUG, dss);