From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 22 Jul 2019 13:48:26 +0000 (-0400)
Subject: librbd: abort an image removal if block objects cannot be removed
X-Git-Tag: v15.1.0~2058^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=361e51f3fb4f146048995e5adbeb8ff90685fc53;p=ceph.git

librbd: abort an image removal if block objects cannot be removed

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/image/RemoveRequest.cc b/src/librbd/image/RemoveRequest.cc
index d5154b977ee5..865df16d74e6 100644
--- a/src/librbd/image/RemoveRequest.cc
+++ b/src/librbd/image/RemoveRequest.cc
@@ -152,8 +152,10 @@ void RemoveRequest<I>::handle_trim_image(int r) {
   ldout(m_cct, 20) << "r=" << r << dendl;
 
   if (r < 0) {
-    lderr(m_cct) << "warning: failed to remove some object(s): "
+    lderr(m_cct) << "failed to remove some object(s): "
                  << cpp_strerror(r) << dendl;
+    send_close_image(r);
+    return;
   }
 
   if (m_old_format) {