From: Samuel Just <sam.just@inktank.com>
Date: Tue, 7 Oct 2014 17:51:21 +0000 (-0700)
Subject: Merge pull request #2489 from guangyy/wip-9008
X-Git-Tag: v0.88~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45a201f36f786e3771766d23e1f861ee0396bcba;p=ceph.git

Merge pull request #2489 from guangyy/wip-9008

For pgls OP, get/put budget on per list session basis, instead of per OP basis.

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

45a201f36f786e3771766d23e1f861ee0396bcba
diff --cc src/osdc/Objecter.cc
index 34858f633aa5,7af51e3d268c..cdd174966bd8
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -2288,13 -2294,9 +2295,13 @@@ void Objecter::_finish_op(Op *op
  
    assert(op->session->lock.is_wlocked());
  
-   if (op->budgeted)
+   if (!op->ctx_budgeted && op->budgeted)
      put_op_budget(op);
  
 +  if (op->ontimeout) {
 +    timer.cancel_event(op->ontimeout);
 +  }
 +
    _session_op_remove(op->session, op);
  
    logger->dec(l_osdc_op_active);