Merge pull request #3540 from athanatos/wip-sam-cache-object-context-across-op

Wip sam cache object context across op

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

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

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

diff --cc src/osd/ReplicatedPG.cc
index dc83821737a4df7405ef0684434b5fb47a046ad3,87ee05cdcc197449f505945b65265b1f2aa31bfd..e0e1830aa8cac869f34e212c3db536ae903a8989
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -1233,8 -1232,8 +1233,9 @@@ ReplicatedPG::ReplicatedPG(OSDService *
    pgbackend(
      PGBackend::build_pg_backend(
        _pool.info, curmap, this, coll_t(p), coll_t::make_temp_coll(p), o->store, cct)),
+   object_contexts(o->cct, g_conf->osd_pg_object_context_cache_count),
    snapset_contexts_lock("ReplicatedPG::snapset_contexts"),
 +  new_backfill(false),
    temp_seq(0),
    snap_trimmer_machine(this)
  { 

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