]> git-server-git.apps.pok.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>
Thu, 20 Dec 2018 22:17:28 +0000 (01:17 +0300)
This caused a permanent stuck on tool's startup.

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

Conflicts:
      src/os/bluestore/bluestore_tool.cc

src/os/bluestore/bluestore_tool.cc

index 71fef1e5aeae82237dcc6481111a95fa1ea52498..c307a6cd6f6ce06cde37293d53c45ff081f6f82a 100644 (file)
@@ -299,7 +299,9 @@ int main(int argc, char **argv)
   env_to_vec(args);
 
   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" ||