]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
objecter: don't take extra throttle budget for resent ops
authorJosh Durgin <josh.durgin@inktank.com>
Sat, 7 Dec 2013 00:03:20 +0000 (16:03 -0800)
committerSage Weil <sage@inktank.com>
Mon, 30 Dec 2013 16:49:22 +0000 (08:49 -0800)
commit4dae50d8a0ffe3f3491eae62950fe46229aaa0e6
treeb5ea3d6802b847bee99266604ca949ad41775979
parent4944618fe74e1875e37a5de9a5bfe3922f906942
objecter: don't take extra throttle budget for resent ops

These ops have already taken their budget in the original op_submit().
It will be returned via put_op_budget() when they complete.
If there were many localized reads of missing objects from replicas,
or cache pool redirects, this would cause the objecter to use up all
of its op throttle budget and hang.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit 8d0180b1b7b48662daef199931efc7f2a6a1c431)

Conflicts:

src/osdc/Objecter.cc
src/osdc/Objecter.cc