]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: allow trash rm/purge when pool quota is full used 20697/head
authorsongweibin <song.weibin@zte.com.cn>
Sun, 4 Mar 2018 03:42:06 +0000 (11:42 +0800)
committersongweibin <song.weibin@zte.com.cn>
Sun, 4 Mar 2018 03:42:06 +0000 (11:42 +0800)
Signed-off-by: songweibin <song.weibin@zte.com.cn>
src/tools/rbd/action/Trash.cc

index b1ad5ade30e78d9bd128589267b260c55ff5eaa0..437eb8433f5a124e760235334c1dab6fc852e4b6 100644 (file)
@@ -151,6 +151,7 @@ int execute_remove(const po::variables_map &vm,
     return r;
   }
 
+  io_ctx.set_osdmap_full_try();
   librbd::RBD rbd;
 
   utils::ProgressContext pc("Removing image", vm[at::NO_PROGRESS].as<bool>());
@@ -377,6 +378,7 @@ int execute_purge (const po::variables_map &vm,
     return r;
   }
 
+  io_ctx.set_osdmap_full_try();
   librbd::RBD rbd;
   
   std::vector<librbd::trash_image_info_t> trash_entries;