From a4666c8caf8125b8ba8b0225a089e782d891230d Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 16:41:22 +0800
Subject: [PATCH] tools/rbd: s/set_osdmap_full_try/set_pool_full_try/

as set_osdmap_full_try() is deprecated now

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/tools/rados/rados.cc          | 2 +-
 src/tools/rbd/action/Migration.cc | 8 ++++----
 src/tools/rbd/action/Remove.cc    | 2 +-
 src/tools/rbd/action/Snap.cc      | 6 +++---
 src/tools/rbd/action/Trash.cc     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index d88f00337f0f0..7096041ea935a 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -3041,7 +3041,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
       return 1;
     }
     io_ctx.set_namespace(all_nspaces);
-    io_ctx.set_osdmap_full_try();
+    io_ctx.set_pool_full_try();
     RadosBencher bencher(g_ceph_context, rados, io_ctx);
     ret = bencher.clean_up_slow("", concurrent_ios);
     if (ret >= 0) {
diff --git a/src/tools/rbd/action/Migration.cc b/src/tools/rbd/action/Migration.cc
index bb05e376d01e8..d47801ef76c59 100644
--- a/src/tools/rbd/action/Migration.cc
+++ b/src/tools/rbd/action/Migration.cc
@@ -169,7 +169,7 @@ int execute_prepare(const po::variables_map &vm,
   if (r < 0) {
     return r;
   }
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   std::string dest_pool_name;
   std::string dest_namespace_name;
@@ -232,7 +232,7 @@ int execute_execute(const po::variables_map &vm,
   if (r < 0) {
     return r;
   }
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   r = do_execute(io_ctx, image_name, vm[at::NO_PROGRESS].as<bool>());
   if (r < 0) {
@@ -268,7 +268,7 @@ int execute_abort(const po::variables_map &vm,
   if (r < 0) {
     return r;
   }
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   r = do_abort(io_ctx, image_name, vm[at::NO_PROGRESS].as<bool>());
   if (r < 0) {
@@ -306,7 +306,7 @@ int execute_commit(const po::variables_map &vm,
   if (r < 0) {
     return r;
   }
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   r = do_commit(io_ctx, image_name, vm["force"].as<bool>(),
                 vm[at::NO_PROGRESS].as<bool>());
diff --git a/src/tools/rbd/action/Remove.cc b/src/tools/rbd/action/Remove.cc
index 337d42be610e5..c5dcf23231284 100644
--- a/src/tools/rbd/action/Remove.cc
+++ b/src/tools/rbd/action/Remove.cc
@@ -77,7 +77,7 @@ int execute(const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   librbd::RBD rbd;
   r = do_delete(rbd, io_ctx, image_name.c_str(),
diff --git a/src/tools/rbd/action/Snap.cc b/src/tools/rbd/action/Snap.cc
index 70cf62dab0cc4..c652ce1c2fef0 100644
--- a/src/tools/rbd/action/Snap.cc
+++ b/src/tools/rbd/action/Snap.cc
@@ -448,7 +448,7 @@ int execute_remove(const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
   if (image_id.empty()) {
     r = utils::open_image(io_ctx, image_name, false, &image);
   } else {
@@ -521,7 +521,7 @@ int execute_purge(const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
   if (image_id.empty()) {
     r = utils::open_image(io_ctx, image_name, false, &image);
   } else {
@@ -671,7 +671,7 @@ int execute_unprotect(const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
   if (image_id.empty()) {
     r = utils::open_image(io_ctx, image_name, false, &image);
   } else {
diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
index d9900611c2976..16b11b9e38d23 100644
--- a/src/tools/rbd/action/Trash.cc
+++ b/src/tools/rbd/action/Trash.cc
@@ -135,7 +135,7 @@ int execute_remove(const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
   librbd::RBD rbd;
 
   utils::ProgressContext pc("Removing image", vm[at::NO_PROGRESS].as<bool>());
@@ -418,7 +418,7 @@ int execute_purge (const po::variables_map &vm,
     return r;
   }
 
-  io_ctx.set_osdmap_full_try();
+  io_ctx.set_pool_full_try();
 
   float threshold = -1;
   time_t expire_ts = 0;
-- 
2.39.5