mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
bug #4662: Do not double unlock on deploy/migrate operations
(cherry picked from commit 61a246400f)
This commit is contained in:
1 parent
eae3a5585f
commit
eebd889e3a
1 file changed
-12
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user