From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 21 Apr 2025 14:52:02 +0000 (+0200)
Subject: rbd: don't print "image will expire at" message when trash_move() fails
X-Git-Tag: v20.3.0~18^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1fd79d41a527ae0e0e4a66a18d67c4b180f66106;p=ceph.git

rbd: don't print "image will expire at" message when trash_move() fails

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
index f1fd4df3c364f..3e7c039102d7c 100644
--- a/src/tools/rbd/action/Trash.cc
+++ b/src/tools/rbd/action/Trash.cc
@@ -99,12 +99,13 @@ int execute_move(const po::variables_map &vm,
   if (r < 0) {
     std::cerr << "rbd: deferred delete error: " << cpp_strerror(r)
               << std::endl;
+    return r;
   }
 
   if (expires_at != "now") {
     std::cout << "rbd: image " << image_name << " will expire at " << exp_time << std::endl;
   }
-  return r;
+  return 0;
 }
 
 void get_remove_arguments(po::options_description *positional,