]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tool/ceph-bluestore-tool: avoid mon/config access when calling global_init
authorIgor Fedotov <ifedotov@suse.com>
Fri, 18 May 2018 14:47:29 +0000 (17:47 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Mon, 1 Oct 2018 14:07:33 +0000 (17:07 +0300)
This caused a permanent stuck on tool's startup.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fa65e7bf65bea514b66f56053d5cbf2c16045f4c)

src/os/bluestore/bluestore_tool.cc

index 97e7db58ded0579d372d6bc843052c64e454500f..bc733735977fff8853d95423e9adb7e70bbd4f56 100644 (file)
@@ -292,9 +292,10 @@ int main(int argc, char **argv)
   for (auto& i : ceph_option_strings) {
     args.push_back(i.c_str());
   }
-
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
-                        CODE_ENVIRONMENT_UTILITY, 0);
+                        CODE_ENVIRONMENT_UTILITY,
+                        CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
+
   common_init_finish(cct.get());
 
   if (action == "fsck" ||