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

bug #4662: Do not double unlock on deploy/migrate operations

Browse Source 
(cherry picked from commit 61a246400f65156529008cc34d760ca0fe86fc8a)
This commit is contained in:
Ruben S. Montero 2016-08-01 10:58:19 +02:00
parent 58206b5fca
commit 3ad4d275d3
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dm/DispatchManagerActions.cc
View File

@ -58,18 +58,14 @@ int DispatchManager::deploy (
goto error;
}
vm->unlock();
return 0;
error:
oss.str("");
oss << "Could not deploy VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
return -1;
}
@ -127,8 +123,6 @@ int DispatchManager::import (
vmpool->update_history(vm);
vm->unlock();
return 0;
}
@ -164,8 +158,6 @@ int DispatchManager::migrate(
goto error;
}
vm->unlock();
return 0;
error:
@ -174,7 +166,6 @@ error:
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
return -1;
}
@ -207,8 +198,6 @@ int DispatchManager::live_migrate(
goto error;
}
vm->unlock();
return 0;
error:
@ -217,7 +206,6 @@ error:
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
return -1;
}