From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 7 Dec 2016 02:27:13 +0000 (+0800)
Subject: os/bluestore: cleanup Cache::_audit
X-Git-Tag: v11.1.1~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba6a43aade21e6846b74af958a81f9a92bf3dfd1;p=ceph.git

os/bluestore: cleanup Cache::_audit

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e7d891a5669..b61bc010ac2 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -646,23 +646,21 @@ void BlueStore::LRUCache::_trim(uint64_t onode_max, uint64_t buffer_max)
 #ifdef DEBUG_CACHE
 void BlueStore::LRUCache::_audit(const char *when)
 {
-  if (true) {
-    dout(10) << __func__ << " " << when << " start" << dendl;
-    uint64_t s = 0;
+  dout(10) << __func__ << " " << when << " start" << dendl;
+  uint64_t s = 0;
+  for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
+    s += i->length;
+  }
+  if (s != buffer_size) {
+    derr << __func__ << " buffer_size " << buffer_size << " actual " << s
+	 << dendl;
     for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
-      s += i->length;
-    }
-    if (s != buffer_size) {
-      derr << __func__ << " buffer_size " << buffer_size << " actual " << s
-	   << dendl;
-      for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
-	derr << __func__ << " " << *i << dendl;
-      }
-      assert(s == buffer_size);
+      derr << __func__ << " " << *i << dendl;
     }
-    dout(20) << __func__ << " " << when << " buffer_size " << buffer_size
-	     << " ok" << dendl;
+    assert(s == buffer_size);
   }
+  dout(20) << __func__ << " " << when << " buffer_size " << buffer_size
+	   << " ok" << dendl;
 }
 #endif
 
@@ -901,44 +899,42 @@ void BlueStore::TwoQCache::_trim(uint64_t onode_max, uint64_t buffer_max)
 #ifdef DEBUG_CACHE
 void BlueStore::TwoQCache::_audit(const char *when)
 {
-  if (true) {
-    dout(10) << __func__ << " " << when << " start" << dendl;
-    uint64_t s = 0;
-    for (auto i = buffer_hot.begin(); i != buffer_hot.end(); ++i) {
-      s += i->length;
-    }
-
-    uint64_t hot_bytes = s;
-    if (hot_bytes != buffer_list_bytes[BUFFER_HOT]) {
-      derr << __func__ << " hot_list_bytes "
-           << buffer_list_bytes[BUFFER_HOT]
-           << " != actual " << hot_bytes
-           << dendl;
-      assert(hot_bytes == buffer_list_bytes[BUFFER_HOT]);
-    }
+  dout(10) << __func__ << " " << when << " start" << dendl;
+  uint64_t s = 0;
+  for (auto i = buffer_hot.begin(); i != buffer_hot.end(); ++i) {
+    s += i->length;
+  }
 
-    for (auto i = buffer_warm_in.begin(); i != buffer_warm_in.end(); ++i) {
-      s += i->length;
-    }
+  uint64_t hot_bytes = s;
+  if (hot_bytes != buffer_list_bytes[BUFFER_HOT]) {
+    derr << __func__ << " hot_list_bytes "
+         << buffer_list_bytes[BUFFER_HOT]
+         << " != actual " << hot_bytes
+         << dendl;
+    assert(hot_bytes == buffer_list_bytes[BUFFER_HOT]);
+  }
 
-    uint64_t warm_in_bytes = s - hot_bytes;
-    if (warm_in_bytes != buffer_list_bytes[BUFFER_WARM_IN]) {
-      derr << __func__ << " warm_in_list_bytes "
-           << buffer_list_bytes[BUFFER_WARM_IN]
-           << " != actual " << warm_in_bytes
-           << dendl;
-      assert(warm_in_bytes == buffer_list_bytes[BUFFER_WARM_IN]);
-    }
+  for (auto i = buffer_warm_in.begin(); i != buffer_warm_in.end(); ++i) {
+    s += i->length;
+  }
 
-    if (s != buffer_bytes) {
-      derr << __func__ << " buffer_bytes " << buffer_bytes << " actual " << s
-	   << dendl;
-      assert(s == buffer_bytes);
-    }
+  uint64_t warm_in_bytes = s - hot_bytes;
+  if (warm_in_bytes != buffer_list_bytes[BUFFER_WARM_IN]) {
+    derr << __func__ << " warm_in_list_bytes "
+         << buffer_list_bytes[BUFFER_WARM_IN]
+         << " != actual " << warm_in_bytes
+         << dendl;
+    assert(warm_in_bytes == buffer_list_bytes[BUFFER_WARM_IN]);
+  }
 
-    dout(20) << __func__ << " " << when << " buffer_bytes " << buffer_bytes
-	     << " ok" << dendl;
+  if (s != buffer_bytes) {
+    derr << __func__ << " buffer_bytes " << buffer_bytes << " actual " << s
+	 << dendl;
+    assert(s == buffer_bytes);
   }
+
+  dout(20) << __func__ << " " << when << " buffer_bytes " << buffer_bytes
+	   << " ok" << dendl;
 }
 #endif