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: v14.2.3~13^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05eb65adc92e3f7002f92976480ed69575c306d2;p=ceph.git

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

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 361e51f3fb4f146048995e5adbeb8ff90685fc53)
---

diff --git a/src/librbd/image/RemoveRequest.cc b/src/librbd/image/RemoveRequest.cc
index 88af466615a5..1cff51b3eae5 100644
--- a/src/librbd/image/RemoveRequest.cc
+++ b/src/librbd/image/RemoveRequest.cc
@@ -149,8 +149,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) {