From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 17 Jan 2018 18:43:58 +0000 (-0500)
Subject: librbd: properly handle group snap add failure case
X-Git-Tag: wip-pdonnell-testing-20180317.202121~469^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=deba6b419c8b171153e9262ddb5dd38653be9dff;p=ceph-ci.git

librbd: properly handle group snap add failure case

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

diff --git a/src/librbd/api/Group.cc b/src/librbd/api/Group.cc
index 71a9cd348d7..4c8699ac12c 100644
--- a/src/librbd/api/Group.cc
+++ b/src/librbd/api/Group.cc
@@ -862,8 +862,11 @@ remove_image_snaps:
     ictx->snap_lock.put_read();
     if (r >= 0) {
       ictx->operations->snap_remove(ne, snap_name.c_str(), on_finishes[i]);
+    } else {
+      // Ignore missing image snapshots. The whole snapshot could have been
+      // inconsistent.
+      on_finishes[i]->complete(0);
     }
-    // Ignore missing image snapshots. The whole snapshot could have been inconsistent.
   }
 
   for (int i = 0, n = on_finishes.size(); i < n; ++i) {