]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: In realease(Object *) make the error bh as clean and later remove.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 3 Feb 2015 06:59:05 +0000 (14:59 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Mon, 9 Mar 2015 05:23:54 +0000 (13:23 +0800)
Avoid met this assert error:
  osdc/ObjectCacher.cc: 551: FAILED assert(i->empty())

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/ObjectCacher.cc

index 865f360570ef762448b16c193fefce68261d4352..f2b7e955430c37855788943f1876e5682a420815 100644 (file)
@@ -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();