From: Sage Weil <sage@newdream.net>
Date: Wed, 3 Feb 2021 21:44:11 +0000 (-0500)
Subject: librados: set FULL_TRY flag on ioctx, not objecter
X-Git-Tag: v16.2.0~194^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cc2418d02e5b4e5f86c81f4940bb3ab798d72b8;p=ceph.git

librados: set FULL_TRY flag on ioctx, not objecter

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a8bed67ad17f8d9114888cd1eba81c05555cfa73)
---

diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc
index aa508c636f88..6f9871127fd7 100644
--- a/src/librados/librados_c.cc
+++ b/src/librados/librados_c.cc
@@ -522,7 +522,7 @@ extern "C" void LIBRADOS_C_API_DEFAULT_F(rados_set_osdmap_full_try)(
   rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
-  ctx->objecter->set_pool_full_try();
+  ctx->extra_op_flags |= CEPH_OSD_FLAG_FULL_TRY;
 }
 LIBRADOS_C_API_BASE_DEFAULT(rados_set_osdmap_full_try);
 
@@ -530,21 +530,21 @@ extern "C" void LIBRADOS_C_API_DEFAULT_F(rados_unset_osdmap_full_try)(
   rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
-  ctx->objecter->unset_pool_full_try();
+  ctx->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
 LIBRADOS_C_API_BASE_DEFAULT(rados_unset_pool_full_try);
 
 extern "C" void _rados_set_pool_full_try(rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
-  ctx->objecter->set_pool_full_try();
+  ctx->extra_op_flags |= CEPH_OSD_FLAG_FULL_TRY;
 }
 LIBRADOS_C_API_BASE_DEFAULT(rados_set_pool_full_try);
 
 extern "C" void _rados_unset_pool_full_try(rados_ioctx_t io)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
-  ctx->objecter->unset_pool_full_try();
+  ctx->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
 LIBRADOS_C_API_BASE_DEFAULT(rados_unset_osdmap_full_try);
 
diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc
index 9557f1185489..78bf0b562e3b 100644
--- a/src/librados/librados_cxx.cc
+++ b/src/librados/librados_cxx.cc
@@ -2306,22 +2306,22 @@ librados::IoCtx::IoCtx(IoCtxImpl *io_ctx_impl_)
 
 void librados::IoCtx::set_osdmap_full_try()
 {
-  io_ctx_impl->objecter->set_pool_full_try();
+  io_ctx_impl->extra_op_flags |= CEPH_OSD_FLAG_FULL_TRY;
 }
 
 void librados::IoCtx::unset_osdmap_full_try()
 {
-  io_ctx_impl->objecter->unset_pool_full_try();
+  io_ctx_impl->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
 
 void librados::IoCtx::set_pool_full_try()
 {
-  io_ctx_impl->objecter->set_pool_full_try();
+  io_ctx_impl->extra_op_flags |= CEPH_OSD_FLAG_FULL_TRY;
 }
 
 void librados::IoCtx::unset_pool_full_try()
 {
-  io_ctx_impl->objecter->unset_pool_full_try();
+  io_ctx_impl->extra_op_flags &= ~CEPH_OSD_FLAG_FULL_TRY;
 }
 
 ///////////////////////////// Rados //////////////////////////////