From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 20 Feb 2019 14:14:01 +0000 (-0500)
Subject: rbd: don't hide partially deleted images in long image list
X-Git-Tag: v14.1.0~1^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=554521d767c2162399086e2338079a4c4b78ca5f;p=ceph-ci.git

rbd: don't hide partially deleted images in long image list

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

diff --git a/src/tools/rbd/action/List.cc b/src/tools/rbd/action/List.cc
index 9028a570665..e60254183ad 100644
--- a/src/tools/rbd/action/List.cc
+++ b/src/tools/rbd/action/List.cc
@@ -255,10 +255,9 @@ int do_list(const std::string &pool_name, const std::string& namespace_name,
 	  r = comp->completion->get_return_value();
 	  comp->completion->release();
 	  if (r < 0) {
-	    if (r != -ENOENT) {
-	      std::cerr << "rbd: error opening " << i->name << ": "
-                        << cpp_strerror(r) << std::endl;
-	    }
+	    std::cerr << "rbd: error opening " << comp->name << ": "
+                      << cpp_strerror(r) << std::endl;
+
 	    // in any event, continue to next image
 	    comp->state = STATE_IDLE;
 	    continue;
@@ -324,7 +323,7 @@ int execute(const po::variables_map &vm,
               g_conf().get_val<uint64_t>("rbd_concurrent_management_ops"),
               formatter.get());
   if (r < 0) {
-    std::cerr << "rbd: listing images failed : " << cpp_strerror(r)
+    std::cerr << "rbd: listing images failed: " << cpp_strerror(r)
               << std::endl;
     return r;
   }