]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: don't print "image will expire at" message when trash_move() fails
authorIlya Dryomov <idryomov@gmail.com>
Mon, 21 Apr 2025 14:52:02 +0000 (16:52 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 22 Apr 2025 18:25:45 +0000 (20:25 +0200)
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/tools/rbd/action/Trash.cc

index f1fd4df3c364ff8f6c7e691e48897586ccc8354f..3e7c039102d7c2410fadcbeba5d12d6d2fa3dcf0 100644 (file)
@@ -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,