From 5126bd70850812d69fcc251b88d7d6b88033ad6c Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 21 Nov 2012 13:24:24 -0800
Subject: [PATCH] rbd: make snap purge fail if removing a snap fails

Otherwise we report 100% removed when some may have failed.

Reported-by: Andrey Korolyov <andrey@xdel.ru>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---
 src/rbd.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/rbd.cc b/src/rbd.cc
index fa7648a214815..09d506f1ef7b8 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -472,7 +472,11 @@ static int do_purge_snaps(librbd::Image& image)
   }
 
   for (size_t i = 0; i < snaps.size(); ++i) {
-    image.snap_remove(snaps[i].name.c_str());
+    r = image.snap_remove(snaps[i].name.c_str());
+    if (r < 0) {
+      pc.fail();
+      return r;
+    }
     pc.update_progress(i + 1, snaps.size());
   }
 
-- 
2.39.5