From db2f08db36e12196ba38852dbb8c4814ff15104e Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Thu, 17 Jan 2019 00:02:48 +0800 Subject: [PATCH] tools: immutable_object_cache code format cleanup Signed-off-by: Yuan Zhou --- src/tools/immutable_object_cache/CacheController.cc | 5 +++-- src/tools/immutable_object_cache/ObjectCacheStore.cc | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tools/immutable_object_cache/CacheController.cc b/src/tools/immutable_object_cache/CacheController.cc index b657a101655..9b439f6c980 100644 --- a/src/tools/immutable_object_cache/CacheController.cc +++ b/src/tools/immutable_object_cache/CacheController.cc @@ -84,8 +84,9 @@ void CacheController::handle_request(uint64_t session_id, ObjectCacheRequest* re break; } - ldout(m_cct, 5) << "can't recongize request" << dendl; - ceph_assert(0); // TODO replace it. + default: + ldout(m_cct, 5) << "can't recongize request" << dendl; + ceph_assert(0); } } diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc index 5a5666dbcbc..ea066e6d7f9 100644 --- a/src/tools/immutable_object_cache/ObjectCacheStore.cc +++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc @@ -99,7 +99,7 @@ int ObjectCacheStore::do_promote(std::string pool_name, std::string object_name) } } - assert(m_ioctxs.find(pool_name) != m_ioctxs.end()); + ceph_assert(m_ioctxs.find(pool_name) != m_ioctxs.end()); librados::IoCtx* ioctx = m_ioctxs[pool_name]; @@ -150,9 +150,9 @@ int ObjectCacheStore::handle_promote_callback(int ret, bufferlist* read_buf, } // update metadata - assert(OBJ_CACHE_SKIP == m_policy->get_status(cache_file_name)); + ceph_assert(OBJ_CACHE_SKIP == m_policy->get_status(cache_file_name)); m_policy->update_status(cache_file_name, OBJ_CACHE_PROMOTED); - assert(OBJ_CACHE_PROMOTED == m_policy->get_status(cache_file_name)); + ceph_assert(OBJ_CACHE_PROMOTED == m_policy->get_status(cache_file_name)); delete read_buf; @@ -183,7 +183,7 @@ int ObjectCacheStore::lookup_object(std::string pool_name, return -1; default: lderr(m_cct) << "unrecognized object cache status." << dendl; - assert(0); + ceph_assert(0); } } -- 2.39.5