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

Bug #3876: Adjust locking order in vm and host

Browse Source
This commit is contained in:
Tino Vazquez 2015-08-24 17:27:53 +02:00
parent d800652d0d
commit ea9b2342bb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dm/DispatchManagerActions.cc
View File

@ -773,21 +773,31 @@ int DispatchManager::finalize(
VirtualMachine::VmState state;
bool is_public_host = false;
int host_id = -1;
vm = vmpool->get(vid,true);
if(vm->hasHistory())
{
host = hpool->get(vm->get_hid(),true);
is_public_host = host->is_public_cloud();
host->unlock();
}
vm = vmpool->get(vid,true);
if ( vm == 0 )
{
return -1;
}
if(vm->hasHistory())
{
host_id = vm->get_hid();
}
vm->unlock();
if(host_id != -1)
{
host = hpool->get(host_id,true);
is_public_host = host->is_public_cloud();
host->unlock();
}
vm = vmpool->get(vid,true);
state = vm->get_state();
oss << "Finalizing VM " << vid;