From ad8f6477b2ff47b0647fa6a4c848449a2930a45a Mon Sep 17 00:00:00 2001 From: shangdehao1 Date: Thu, 13 Jun 2019 06:04:30 +0800 Subject: [PATCH] librbd: refine hard code and remove dead code Signed-off-by: Dehao Shang --- src/librbd/cache/ParentCacheObjectDispatch.cc | 11 ++++------- src/test/immutable_object_cache/test_DomainSocket.cc | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/librbd/cache/ParentCacheObjectDispatch.cc b/src/librbd/cache/ParentCacheObjectDispatch.cc index 65e55927da2..a6a00def13f 100644 --- a/src/librbd/cache/ParentCacheObjectDispatch.cc +++ b/src/librbd/cache/ParentCacheObjectDispatch.cc @@ -168,14 +168,11 @@ int ParentCacheObjectDispatch::create_cache_session(Context* on_finish, bool Context* register_ctx = new FunctionContext([this, cct, on_finish](int ret) { if (ret < 0) { lderr(cct) << "Parent cache fail to register client." << dendl; - handle_register_client(false); - on_finish->complete(-1); - return; + } else { + ceph_assert(m_cache_client->is_session_work()); } - ceph_assert(m_cache_client->is_session_work()); - - handle_register_client(true); - on_finish->complete(0); + handle_register_client(ret < 0 ? false : true); + on_finish->complete(ret); }); Context* connect_ctx = new FunctionContext( diff --git a/src/test/immutable_object_cache/test_DomainSocket.cc b/src/test/immutable_object_cache/test_DomainSocket.cc index d1a1aa2cf1b..ad9e79a0bfa 100644 --- a/src/test/immutable_object_cache/test_DomainSocket.cc +++ b/src/test/immutable_object_cache/test_DomainSocket.cc @@ -130,8 +130,6 @@ public: bool startup_lookupobject_testing(std::string pool_nspace, std::string object_id) { bool hit; - //auto ctx = new LambdaGenContext, - // ObjectCacheRequest*>([this, &hit](ObjectCacheRequest* ack){ auto ctx = make_gen_lambda_context> ([this, &hit](ObjectCacheRequest* ack){ hit = ack->type == RBDSC_READ_REPLY; -- 2.47.3