From 6a18ada2b12294b98ab385576a3e9669f4f52a3d Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 10 Jul 2012 08:12:29 -0700 Subject: Don't block instance delete on missing block device volume It's easy to create an undeletable instance by specifying an invalid volume id in the block device mapping. The instance errors, but subsequent delete fails because the volume is missing. We already ignore the DiskNotFound case during delete, so this adds a case for VolumeNotFound. Change-Id: Ibc516ee4452d088cddf10bbeb315697ce900e5c5 --- nova/compute/manager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 10fc0277d..447715aeb 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -738,6 +738,9 @@ class ComputeManager(manager.SchedulerDependentManager): except exception.DiskNotFound as exc: LOG.warn(_('Ignoring DiskNotFound: %s') % exc, instance=instance) + except exception.VolumeNotFound as exc: + LOG.warn(_('Ignoring VolumeNotFound: %s') % exc, + instance=instance) self._notify_about_instance_usage(context, instance, "shutdown.end") -- cgit