From 2d69076943b9724ce1d5c9f03f2f7594a77b92d2 Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Fri, 12 Dec 2014 14:58:54 -0800
Subject: [PATCH] ceph_objectstore_tool: Get g_ceph_context available to
 import-rados

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ddc4613ec71752e5dccbbfe6dc078b86f0f186a9)

Conflicts:
	src/tools/ceph_objectstore_tool.cc
---
 src/tools/ceph_objectstore_tool.cc | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 0a3ab3fd9504c..1e750a3cda136 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2128,6 +2128,17 @@ int main(int argc, char **argv)
     debug = true;
   }
 
+  vector<const char *> ceph_options;
+  env_to_vec(ceph_options);
+  vector<string> ceph_option_strings = po::collect_unrecognized(
+    parsed.options, po::include_positional);
+  ceph_options.reserve(ceph_options.size() + ceph_option_strings.size());
+  for (vector<string>::iterator i = ceph_option_strings.begin();
+       i != ceph_option_strings.end();
+       ++i) {
+    ceph_options.push_back(i->c_str());
+  }
+
   // Handle completely different operation "import-rados"
   if (object == "import-rados") {
     if (vm.count("objcmd") == 0) {
@@ -2157,6 +2168,10 @@ int main(int argc, char **argv)
         return 1;
       }
     }
+
+    global_init(NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
+    common_init_finish(g_ceph_context);
+
     int ret = do_import_rados(pool);
     if (ret == 0)
       cout << "Import successful" << std::endl;
@@ -2226,17 +2241,6 @@ int main(int argc, char **argv)
     return 1;
   }
 
-  vector<const char *> ceph_options;
-  env_to_vec(ceph_options);
-  vector<string> ceph_option_strings = po::collect_unrecognized(
-    parsed.options, po::include_positional);
-  ceph_options.reserve(ceph_options.size() + ceph_option_strings.size());
-  for (vector<string>::iterator i = ceph_option_strings.begin();
-       i != ceph_option_strings.end();
-       ++i) {
-    ceph_options.push_back(i->c_str());
-  }
-
   osflagbits_t flags = 0;
   if (vm.count("skip-journal-replay"))
     flags |= SKIP_JOURNAL_REPLAY;
-- 
2.39.5