Merge pull request #1620 from ceph/wip-8003

Wip 8003

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

diff --cc src/osd/ReplicatedPG.cc
index 66906ef7a2ae958dff44baac3171d3804e7cd680,0ca33370430fa8e1a86d0761f1cdae0ba73e9e43..30e3f15cbc7998996f9b0f9cc387c90e54525096
--- 1/src/osd/ReplicatedPG.cc
--- 2/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);

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge