From 61a246400f65156529008cc34d760ca0fe86fc8a Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 1 Aug 2016 10:58:19 +0200 Subject: [PATCH] bug #4662: Do not double unlock on deploy/migrate operations --- src/dm/DispatchManagerActions.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 66a5aac144..0ad0145162 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -57,17 +57,13 @@ int DispatchManager::deploy ( goto error; } - vm->unlock(); - return 0; error: - oss.str(""); oss << "Could not deploy VM " << vid << ", wrong state."; NebulaLog::log("DiM",Log::ERROR,oss); - vm->unlock(); return -1; } @@ -115,8 +111,6 @@ int DispatchManager::import ( vmpool->update_history(vm); - vm->unlock(); - return 0; } @@ -152,8 +146,6 @@ int DispatchManager::migrate( goto error; } - vm->unlock(); - return 0; error: @@ -161,7 +153,6 @@ error: oss << "Could not migrate VM " << vid << ", wrong state."; NebulaLog::log("DiM",Log::ERROR,oss); - vm->unlock(); return -1; } @@ -194,8 +185,6 @@ int DispatchManager::live_migrate( goto error; } - vm->unlock(); - return 0; error: @@ -203,7 +192,6 @@ error: oss << "Could not live-migrate VM " << vid << ", wrong state."; NebulaLog::log("DiM",Log::ERROR,oss); - vm->unlock(); return -1; }