From ef260045a15eab39da321d7e46f9c0a5f1fa0d42 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 5 Nov 2013 18:20:20 +0100 Subject: [PATCH] Revert "Fix deadlock when deleting a host with running VMs" This reverts commit 4988ddd0ecbe8bebaf3b1b908030267e085ce5a5. --- src/rm/RequestManagerDelete.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index b29f5d7ee9..52c757adda 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -157,9 +157,6 @@ int HostDelete::drop(int oid, PoolObjectSQL * object, string& error_msg) if ( host->get_share_running_vms() > 0 ) { error_msg = "Can not remove a host with running VMs"; - - host->unlock(); - return -1; }