rados_sync: fix --create for import

Fix import's pool creation faculty.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/rados_sync.cc b/src/rados_sync.cc
index 8b5146828aca2db676df648ca14a725e45705797..02546c2d7d78956ce6791bd03ee879be60694f28 100644 (file)
--- a/src/rados_sync.cc
+++ b/src/rados_sync.cc
@@ -809,31 +809,31 @@ int main(int argc, const char **argv)
   IoCtx io_ctx;
   std::string pool_name = (action == "import") ? dst : src;
   ret = rados.ioctx_create(pool_name.c_str(), io_ctx);
+  if ((ret == -ENOENT) && (action == "import")) {
+    if (create) {
+      ret = rados.pool_create(pool_name.c_str());
+      if (ret) {
+       cerr << argv[0] << ": pool_create failed with error " << ret
+            << std::endl;
+       exit(ret);
+      }
+      ret = rados.ioctx_create(pool_name.c_str(), io_ctx);
+    }
+    else {
+      cerr << argv[0] << ": pool '" << pool_name << "' does not exist. Use "
+          << "--create to try to create it." << std::endl;
+      exit(ENOENT);
+    }
+  }
   if (ret) {
     cerr << argv[0] << ": error opening pool " << pool_name << ": "
         << cpp_strerror(ret) << std::endl;
-    return ret;
+    exit(ret);
   }
 
   std::string dir_name = (action == "import") ? src : dst;
 
   if (action == "import") {
-    if (rados.pool_lookup(pool_name.c_str()) < 0) {
-      if (create) {
-       ret = rados.pool_create(pool_name.c_str());
-       if (ret) {
-         cerr << argv[0] << ": pool_create failed with error " << ret
-              << std::endl;
-         exit(ret);
-       }
-      }
-      else {
-       cerr << argv[0] << ": pool '" << pool_name << "' does not exist. Use "
-            << "--create to try to create it." << std::endl;
-       exit(ENOENT);
-      }
-    }
-
     ret = xattr_test(dir_name.c_str());
     if (ret)
       return ret;