]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: clarify trash remove error code from interrupted move 40675/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 10 Mar 2021 20:31:22 +0000 (15:31 -0500)
committerNathan Cutler <ncutler@suse.com>
Thu, 8 Apr 2021 13:03:24 +0000 (15:03 +0200)
Fixes: https://tracker.ceph.com/issues/49716
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 138d71fb0635682510cadda8e4ad5aaab3f39e44)

src/tools/rbd/action/Trash.cc

index 327b20ba703b9a400f254c72b11c0b5a3179bfac..3362ac30b5f78cc1a1ba2a838c9793304a47fbaf 100644 (file)
@@ -145,6 +145,9 @@ int execute_remove(const po::variables_map &vm,
       std::cerr << "rbd: image has snapshots - these must be deleted"
                 << " with 'rbd snap purge' before the image can be removed."
                 << std::endl;
+    } else if (r == -EUCLEAN) {
+      std::cerr << "rbd: error: image not fully moved to trash."
+                << std::endl;
     } else if (r == -EBUSY) {
       std::cerr << "rbd: error: image still has watchers"
                 << std::endl