From: s09816 <shi.lu@h3c.com>
Date: Fri, 14 Aug 2015 03:24:41 +0000 (-0400)
Subject: rbd:modify the log of purging snaps so that it is more appropriate.
X-Git-Tag: v9.1.0~367^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5537%2Fhead;p=ceph.git

rbd:modify the log of purging snaps so that it is more appropriate.

Signed-off-by: s09816 <shi.lu@h3c.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
old mode 100644
new mode 100755
index 67bdd5800af5..83e551ac57b3
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -787,7 +787,7 @@ static int do_purge_snaps(librbd::Image& image)
         return r;
       } else if (is_protected == true) {
         pc.fail();
-        cerr << "\r" <<snaps[i].name.c_str()<< " is a protected snap."<< std::endl;
+        cerr << "\r" << "rbd: snapshot '" <<snaps[i].name.c_str()<< "' is protected from removal." << std::endl;
         return -EBUSY;
       }
     }
@@ -3847,7 +3847,9 @@ if (!set_conf_param(v, p1, p2, p3)) { \
   case OPT_SNAP_PURGE:
     r = do_purge_snaps(image);
     if (r < 0) {
-      cerr << "rbd: removing snaps failed: " << cpp_strerror(-r) << std::endl;
+      if (r != -EBUSY) {
+        cerr << "rbd: removing snaps failed: " << cpp_strerror(-r) << std::endl;
+      }
       return -r;
     }
     break;