diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-04-13 02:08:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-13 02:08:24 +0000 |
| commit | 4dff434d9c16b3d2bd4942fbc5769ac406f6d072 (patch) | |
| tree | 29f89bbe7992b3c6fb7f83eafda04b0d0574e3da | |
| parent | 4b8f1b163570256eee7cf69f4de61c7c6a84046c (diff) | |
| parent | bd2595f0b0eea504bfcfadc8a77627957669e9fa (diff) | |
Merge "Avoiding exception if guest refuses to detach a volume" into stable/fraser
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rw-r--r-- | build/patches/fix_volume_exception.patch | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index f7d55e58..13b10b98 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -147,6 +147,8 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \ --upload ${BUILD_ROOT}/patches/puppet-ceph.patch:/etc/puppet/modules/ceph/ \ --run-command "cd /etc/puppet/modules/ceph && patch -p1 < puppet-ceph.patch" \ + --upload ${BUILD_ROOT}/patches/fix_volume_exception.patch:/usr/lib/python2.7/site-packages/ \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < fix_volume_exception.patch" \ -a overcloud-full_build.qcow2 # upload and install barometer packages diff --git a/build/patches/fix_volume_exception.patch b/build/patches/fix_volume_exception.patch new file mode 100644 index 00000000..8fa5d4d4 --- /dev/null +++ b/build/patches/fix_volume_exception.patch @@ -0,0 +1,37 @@ +From 804215017f38300ac429e4401ce9c23f0c8ff3c6 Mon Sep 17 00:00:00 2001 +From: Dan Smith <dansmith@redhat.com> +Date: Tue, 20 Feb 2018 14:41:35 -0800 +Subject: [PATCH] Avoid exploding if guest refuses to detach a volume + +When we run detach_volume(), the guest has to respond to the ACPI +eject request in order for us to proceed. It may not do this at all +if the volume is mounted or in-use, or may not by the time we time out +if lots of dirty data needs flushing. Right now, we let the failure +exception bubble up to our caller and we log a nasty stack trace, which +doesn't really convey the reason (and that it's an expected and +reasonable thing to happen). + +Thus, this patch catches that, logs the situation at warning level and +avoids the trace. + +Change-Id: I3800b466a50b1e5f5d1e8c8a963d9a6258af67ee +Closes-Bug: #1750680 +(cherry picked from commit b16c0f10539a6c6b547a70a41c75ef723fc618ce) +(cherry picked from commit 81992142f657a3d71600182935f06efe5f8e8e86) +--- + +diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py +index 74c26ce..aa1a3ee 100644 +--- a/nova/virt/block_device.py ++++ b/nova/virt/block_device.py +@@ -281,6 +281,10 @@ + '%(mp)s : %(err)s', + {'volume_id': volume_id, 'mp': mp, + 'err': err}, instance=instance) ++ except exception.DeviceDetachFailed as err: ++ with excutils.save_and_reraise_exception(): ++ LOG.warning('Guest refused to detach volume %(vol)s', ++ {'vol': volume_id}, instance=instance) + except Exception: + with excutils.save_and_reraise_exception(): + LOG.exception('Failed to detach volume ' |