From: Yuan Zhou <yuan.zhou@intel.com>
Date: Wed, 16 Jan 2019 16:02:48 +0000 (+0800)
Subject: tools: immutable_object_cache code format cleanup
X-Git-Tag: v15.0.0~136^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db2f08db36e12196ba38852dbb8c4814ff15104e;p=ceph.git

tools: immutable_object_cache code format cleanup

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/tools/immutable_object_cache/CacheController.cc b/src/tools/immutable_object_cache/CacheController.cc
index b657a101655d..9b439f6c980a 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 5a5666dbcbc1..ea066e6d7f9b 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);
   }
 }