From: Sage Weil <sage@inktank.com>
Date: Mon, 7 Apr 2014 23:09:40 +0000 (-0700)
Subject: Merge pull request #1620 from ceph/wip-8003
X-Git-Tag: v0.80-rc1~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa301b0e49a54bde8c4264bb7c86f9388cd414eb;p=ceph.git

Merge pull request #1620 from ceph/wip-8003

Wip 8003

Reviewed-by: Sage Weil <sage@inktank.com>
---

aa301b0e49a54bde8c4264bb7c86f9388cd414eb
diff --cc src/osd/ReplicatedPG.cc
index 66906ef7a2ae,0ca33370430f..30e3f15cbc79
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -10976,10 -10907,8 +11022,10 @@@ bool ReplicatedPG::agent_maybe_evict(Ob
    ctx->at_version = get_next_version();
    assert(ctx->new_obs.exists);
    int r = _delete_oid(ctx, true);
 +  if (obc->obs.oi.is_omap())
 +    ctx->delta_stats.num_objects_omap--;
    assert(r == 0);
-   finish_ctx(ctx, pg_log_entry_t::DELETE);
+   finish_ctx(ctx, pg_log_entry_t::DELETE, false);
    simple_repop_submit(repop);
    osd->logger->inc(l_osd_tier_evict);
    osd->logger->inc(l_osd_agent_evict);