]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: clarify trash remove error code from interrupted move 40254/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 10 Mar 2021 20:31:22 +0000 (15:31 -0500)
committersinguliere <singuliere@autistici.org>
Fri, 19 Mar 2021 18:16:14 +0000 (19:16 +0100)
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 b1e0de132f174db46bd4bf8b0c27eee5f0eaa361..dacedd347a23e57d8e45c2e91eb9f27e67d00afa 100644 (file)
@@ -147,6 +147,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