From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 08:41:22 +0000 (+0800)
Subject: tools/rbd: s/set_osdmap_full_try/set_pool_full_try/
X-Git-Tag: v15.1.0~1333^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a4666c8caf8125b8ba8b0225a089e782d891230d;p=ceph-ci.git

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>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index d88f00337f0..7096041ea93 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 bb05e376d01..d47801ef76c 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 337d42be610..c5dcf232312 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 70cf62dab0c..c652ce1c2fe 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 d9900611c29..16b11b9e38d 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;