From: Samuel Just <sam.just@inktank.com>
Date: Thu, 29 Jan 2015 18:39:28 +0000 (-0800)
Subject: Merge pull request #3540 from athanatos/wip-sam-cache-object-context-across-op
X-Git-Tag: v0.93~163
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd2491a10a6fe7f338a7ba86d95b051d1cb95391;p=ceph.git

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>
---

cd2491a10a6fe7f338a7ba86d95b051d1cb95391
diff --cc src/osd/ReplicatedPG.cc
index dc83821737a,87ee05cdcc1..e0e1830aa8c
--- a/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)
  {