From: Kefu Chai Date: Wed, 23 Nov 2016 11:45:57 +0000 (+0800) Subject: crushtool: do not release g_ceph_context at exit X-Git-Tag: v10.2.8~63^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=192e7bcdcd1bc02b40b29eff86a335cc8919f663;p=ceph.git crushtool: do not release g_ceph_context at exit it is but a work around of occasionally timeout. Signed-off-by: Kefu Chai (cherry picked from commit d305cc51b18cbf4b2757bbacb5d43324461306a9) --- diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index 65e1f1223d74..bf67530e3b07 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -273,6 +273,9 @@ int main(int argc, const char **argv) auto cct = global_init(NULL, env_args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); + // crushtool times out occasionally when quits. so do not + // release the g_ceph_context. + cct->get(); common_init_finish(g_ceph_context); int x;