Skip to content

Commit

Permalink
Merge pull request #12966 from dillaman/wip-18436
Browse files Browse the repository at this point in the history
osdc: cache should ignore error bhs during trim

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
  • Loading branch information
Jason Dillaman committed Jan 31, 2017
2 parents d4f6385 + 5910ed9 commit 3d894ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/osdc/ObjectCacher.cc
Expand Up @@ -1234,7 +1234,7 @@ void ObjectCacher::trim()
break;

ldout(cct, 10) << "trim trimming " << *bh << dendl;
assert(bh->is_clean() || bh->is_zero());
assert(bh->is_clean() || bh->is_zero() || bh->is_error());

Object *ob = bh->ob;
bh_remove(ob, bh);
Expand Down

0 comments on commit 3d894ca

Please sign in to comment.