librbd/migration: move away from util::create_ioctx() in NativeFormat

This is another step towards supporting migration from external
clusters, where creating an IoCtx from a Rados instance that has
nothing to do with dst_io_ctx would be needed.  It also allows to
get rid of a pool lookup in the middle of parsing code.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 7986662157491419d366de3dd0070553abb9e1c8)

Conflicts:
	src/librbd/migration/NativeFormat.cc [ commit 8e58a52a408b
	  ("librbd/migration: don't include ImageState.h in formats")
	  was backported to squid out of order ]

diff --git a/src/librbd/migration/NativeFormat.cc b/src/librbd/migration/NativeFormat.cc
index be5078e8ab0447e674126f7019c8dffb3adc4640..d9c030f524c90103bd2f71e36c895930ff3d5f90 100644 (file)
--- a/src/librbd/migration/NativeFormat.cc
+++ b/src/librbd/migration/NativeFormat.cc
@@ -2,16 +2,11 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "librbd/migration/NativeFormat.h"
-#include "include/neorados/RADOS.hpp"
 #include "common/dout.h"
 #include "common/errno.h"
 #include "librbd/ImageCtx.h"
-#include "librbd/Utils.h"
-#include "librbd/asio/ContextWQ.h"
-#include "librbd/io/ImageDispatchSpec.h"
 #include "json_spirit/json_spirit.h"
 #include "boost/lexical_cast.hpp"
-#include <sstream>
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
@@ -64,22 +59,19 @@ int NativeFormat<I>::create_image_ctx(
     const json_spirit::mObject& source_spec_object,
     bool import_only, uint64_t src_snap_id, I** src_image_ctx) {
   auto cct = reinterpret_cast<CephContext*>(dst_io_ctx.cct());
+  std::string pool_name;
   int64_t pool_id = -1;
   std::string pool_namespace;
   std::string image_name;
   std::string image_id;
   std::string snap_name;
   uint64_t snap_id = CEPH_NOSNAP;
+  int r;
 
   if (auto it = source_spec_object.find(POOL_NAME_KEY);
       it != source_spec_object.end()) {
     if (it->second.type() == json_spirit::str_type) {
-      librados::Rados rados(dst_io_ctx);
-      pool_id = rados.pool_lookup(it->second.get_str().c_str());
-      if (pool_id < 0) {
-        lderr(cct) << "failed to lookup pool" << dendl;
-        return static_cast<int>(pool_id);
-      }
+      pool_name = it->second.get_str();
     } else {
       lderr(cct) << "invalid pool name" << dendl;
       return -EINVAL;
@@ -88,7 +80,7 @@ int NativeFormat<I>::create_image_ctx(
 
   if (auto it = source_spec_object.find(POOL_ID_KEY);
       it != source_spec_object.end()) {
-    if (pool_id != -1) {
+    if (!pool_name.empty()) {
       lderr(cct) << "cannot specify both pool name and pool id" << dendl;
       return -EINVAL;
     }
@@ -106,7 +98,7 @@ int NativeFormat<I>::create_image_ctx(
     }
   }
 
-  if (pool_id == -1) {
+  if (pool_name.empty() && pool_id == -1) {
     lderr(cct) << "missing pool name or pool id" << dendl;
     return -EINVAL;
   }
@@ -176,7 +168,7 @@ int NativeFormat<I>::create_image_ctx(
 
   // snapshot is required for import to keep source read-only
   if (import_only && snap_name.empty() && snap_id == CEPH_NOSNAP) {
-    lderr(cct) << "snapshot required for import" << dendl;
+    lderr(cct) << "snap name or snap id required for import" << dendl;
     return -EINVAL;
   }
 
@@ -189,12 +181,19 @@ int NativeFormat<I>::create_image_ctx(
 
   // TODO add support for external clusters
   librados::IoCtx src_io_ctx;
-  int r = util::create_ioctx(dst_io_ctx, "source image", pool_id,
-                             pool_namespace, &src_io_ctx);
+  if (!pool_name.empty()) {
+    r = rados_ptr->ioctx_create(pool_name.c_str(), src_io_ctx);
+  } else {
+    r = rados_ptr->ioctx_create2(pool_id, src_io_ctx);
+  }
   if (r < 0) {
+    lderr(cct) << "failed to open source image pool: " << cpp_strerror(r)
+               << dendl;
     return r;
   }
 
+  src_io_ctx.set_namespace(pool_namespace);
+
   if (!snap_name.empty() && snap_id == CEPH_NOSNAP) {
     *src_image_ctx = I::create(image_name, image_id, snap_name.c_str(),
                                src_io_ctx, true);