From 09251a62dd4d1f1d95a83f35578c214006b334f4 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 10 Mar 2021 15:31:22 -0500 Subject: [PATCH] rbd: clarify trash remove error code from interrupted move Fixes: https://tracker.ceph.com/issues/49716 Signed-off-by: Jason Dillaman (cherry picked from commit 138d71fb0635682510cadda8e4ad5aaab3f39e44) --- src/tools/rbd/action/Trash.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc index 327b20ba703b9..3362ac30b5f78 100644 --- a/src/tools/rbd/action/Trash.cc +++ b/src/tools/rbd/action/Trash.cc @@ -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 -- 2.39.5