From: songweibin <song.weibin@zte.com.cn>
Date: Sun, 4 Mar 2018 03:42:06 +0000 (+0800)
Subject: rbd: allow trash rm/purge when pool quota is full used
X-Git-Tag: v13.0.2~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93d36a8bcb1d5f1c6134332af2e0a58fcd731082;p=ceph.git

rbd: allow trash rm/purge when pool quota is full used

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
index b1ad5ade30e..437eb8433f5 100644
--- a/src/tools/rbd/action/Trash.cc
+++ b/src/tools/rbd/action/Trash.cc
@@ -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;