From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 3 Feb 2015 06:59:05 +0000 (+0800)
Subject: osdc: In realease(Object *) make the error bh as clean and later remove.
X-Git-Tag: v9.0.0~185^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bedae366ca8eaca5a42007c264271199f77cdae;p=ceph.git

osdc: In realease(Object *) make the error bh as clean and later remove.

Avoid met this assert error:
  osdc/ObjectCacher.cc: 551: FAILED assert(i->empty())

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
index 865f360570ef..f2b7e955430c 100644
--- a/src/osdc/ObjectCacher.cc
+++ b/src/osdc/ObjectCacher.cc
@@ -1798,7 +1798,7 @@ loff_t ObjectCacher::release(Object *ob)
        p != ob->data.end();
        ++p) {
     BufferHead *bh = p->second;
-    if (bh->is_clean() || bh->is_zero())
+    if (bh->is_clean() || bh->is_zero() || bh->is_error())
       clean.push_back(bh);
     else 
       o_unclean += bh->length();