From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 08:39:20 +0000 (+0800)
Subject: librados: add IoCtx::{set,unset}_pool_full_try()
X-Git-Tag: v15.1.0~1333^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7f629427d12b05878db03f9d43a5bb189a8ef1d;p=ceph.git

librados: add IoCtx::{set,unset}_pool_full_try()

and deprecate IoCtx::{set,unset}_osdmap_full_try()

the latter are deprecated and are aliases of the former.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index aa72e3804d45..4204d22afe99 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -1278,8 +1278,13 @@ inline namespace v14_2_0 {
 
     config_t cct();
 
-    void set_osdmap_full_try();
-    void unset_osdmap_full_try();
+    void set_osdmap_full_try()
+      __attribute__ ((deprecated));
+    void unset_osdmap_full_try()
+      __attribute__ ((deprecated));
+
+    void set_pool_full_try();
+    void unset_pool_full_try();
 
     int application_enable(const std::string& app_name, bool force);
     int application_enable_async(const std::string& app_name,
diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc
index 9637da1e9294..3b2007270bb0 100644
--- a/src/librados/librados_cxx.cc
+++ b/src/librados/librados_cxx.cc
@@ -2248,6 +2248,16 @@ void librados::IoCtx::unset_osdmap_full_try()
   io_ctx_impl->objecter->unset_pool_full_try();
 }
 
+void librados::IoCtx::set_pool_full_try()
+{
+  io_ctx_impl->objecter->set_pool_full_try();
+}
+
+void librados::IoCtx::unset_pool_full_try()
+{
+  io_ctx_impl->objecter->unset_pool_full_try();
+}
+
 ///////////////////////////// Rados //////////////////////////////
 void librados::Rados::version(int *major, int *minor, int *extra)
 {