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>

diff --cc src/librados/IoCtxImpl.cc
Simple merge

diff --cc src/osdc/Objecter.cc
index 34858f633aa5d71c9beaf2ec2111b3192377e974,7af51e3d268c3bddf670958163f276391713bb03..cdd174966bd8856f2be60ab37b8bc919a76c1b3e
--- 1/src/osdc/Objecter.cc
--- 2/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);

diff --cc src/osdc/Objecter.h
Simple merge