rbd: When Ceph cluster becomes full, should allow user to remove rbd …

src/include/rados/librados.hpp

@@ -1187,6 +1187,9 @@ namespace librados
 
     config_t cct();
 
+    void set_osdmap_full_try();
+    void unset_osdmap_full_try();
+
   private:
     /* You can only get IoCtx instances from Rados */
     IoCtx(IoCtxImpl *io_ctx_impl_);

src/librados/librados.cc

@@ -2082,6 +2082,16 @@ librados::IoCtx::IoCtx(IoCtxImpl *io_ctx_impl_)
 {
 }
 
+void librados::IoCtx::set_osdmap_full_try()
+{
+  io_ctx_impl->objecter->set_osdmap_full_try();
+}
+
+void librados::IoCtx::unset_osdmap_full_try()
+{
+  io_ctx_impl->objecter->unset_osdmap_full_try();
+}
+
 ///////////////////////////// Rados //////////////////////////////
 void librados::Rados::version(int *major, int *minor, int *extra)
 {

src/osdc/Objecter.cc

@@ -3066,6 +3066,9 @@ MOSDOp *Objecter::_prepare_osd_op(Op *op)
   if (!honor_osdmap_full)
     flags |= CEPH_OSD_FLAG_FULL_FORCE;
 
+  if (osdmap_full_try)
+    flags |= CEPH_OSD_FLAG_FULL_TRY;
+
   op->target.paused = false;
   op->stamp = ceph::mono_clock::now();
 

src/osdc/Objecter.h

@@ -1144,6 +1144,7 @@ class Objecter : public md_config_obs_t, public Dispatcher {
   atomic_t global_op_flags; // flags which are applied to each IO op
   bool keep_balanced_budget;
   bool honor_osdmap_full;
+  bool osdmap_full_try;
 
 public:
   void maybe_request_map();
@@ -1913,7 +1914,7 @@ class Objecter : public md_config_obs_t, public Dispatcher {
     Dispatcher(cct_), messenger(m), monc(mc), finisher(fin),
     osdmap(new OSDMap), initialized(0), last_tid(0), client_inc(-1),
     max_linger_id(0), num_in_flight(0), global_op_flags(0),
-    keep_balanced_budget(false), honor_osdmap_full(true),
+    keep_balanced_budget(false), honor_osdmap_full(true), osdmap_full_try(false),
     last_seen_osdmap_version(0), last_seen_pgmap_version(0),
     logger(NULL), tick_event(0), m_request_state_hook(NULL),
     num_homeless_ops(0),
@@ -1983,6 +1984,9 @@ class Objecter : public md_config_obs_t, public Dispatcher {
   void set_honor_osdmap_full() { honor_osdmap_full = true; }
   void unset_honor_osdmap_full() { honor_osdmap_full = false; }
 
+  void set_osdmap_full_try() { osdmap_full_try = true; }
+  void unset_osdmap_full_try() { osdmap_full_try = false; }
+
   void _scan_requests(OSDSession *s,
 		      bool force_resend,
 		      bool cluster_full,

src/tools/rbd/action/Remove.cc

@@ -53,6 +53,8 @@ int execute(const po::variables_map &vm) {
     return r;
   }
 
+  io_ctx.set_osdmap_full_try();
+
   librbd::RBD rbd;
   r = do_delete(rbd, io_ctx, image_name.c_str(),
                 vm[at::NO_PROGRESS].as<bool>());

src/tools/rbd/action/Snap.cc

@@ -279,8 +279,13 @@ int execute_remove(const po::variables_map &vm) {
   librados::Rados rados;
   librados::IoCtx io_ctx;
   librbd::Image image;
-  r = utils::init_and_open_image(pool_name, image_name, "", false, &rados,
-                                 &io_ctx, &image);
+  r = utils::init(pool_name, &rados, &io_ctx);
+  if (r < 0) {
+    return r;
+  }
+
+  io_ctx.set_osdmap_full_try();
+  r = utils::open_image(io_ctx, image_name, false, &image);
   if (r < 0) {
     return r;
   }
@@ -320,8 +325,13 @@ int execute_purge(const po::variables_map &vm) {
   librados::Rados rados;
   librados::IoCtx io_ctx;
   librbd::Image image;
-  r = utils::init_and_open_image(pool_name, image_name, "", false, &rados,
-                                 &io_ctx, &image);
+  r = utils::init(pool_name, &rados, &io_ctx);
+  if (r < 0) {
+    return r;
+  }
+
+  io_ctx.set_osdmap_full_try();
+  r = utils::open_image(io_ctx, image_name, false, &image);
   if (r < 0) {
     return r;
   }
@@ -439,8 +449,13 @@ int execute_unprotect(const po::variables_map &vm) {
   librados::Rados rados;
   librados::IoCtx io_ctx;
   librbd::Image image;
-  r = utils::init_and_open_image(pool_name, image_name, "", false, &rados,
-                                 &io_ctx, &image);
+  r = utils::init(pool_name, &rados, &io_ctx);
+  if (r < 0) {
+    return r;
+  }
+
+  io_ctx.set_osdmap_full_try();
+  r = utils::open_image(io_ctx, image_name, false, &image);
   if (r < 0) {
     return r;
   }