From 729ea754d46cb68dd7809ba1bd7e9ad3c742bde8 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 12 Nov 2013 14:09:58 +0100 Subject: [PATCH] Revert "Revert "Fix deadlock when deleting a host with running VMs"" This reverts commit ef260045a15eab39da321d7e46f9c0a5f1fa0d42. --- src/rm/RequestManagerDelete.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index 52c757adda..b29f5d7ee9 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -157,6 +157,9 @@ 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; }