]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18810 from majianpeng/fix-21982
authorKefu Chai <tchaikov@gmail.com>
Mon, 20 Nov 2017 06:39:17 +0000 (14:39 +0800)
committerGitHub <noreply@github.com>
Mon, 20 Nov 2017 06:39:17 +0000 (14:39 +0800)
osdc/Objecter: record correctly value for l_osdc_op_send_bytes.

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osdc/Objecter.cc

index 310e14bd4b92754180ecb77f88447234103d07e2,c6d26d84948e1364ee3834b0a6d395ad1c003758..03baa7800475936dfaab7925ce0f1d1d9428498e
@@@ -3182,13 -3167,12 +3182,17 @@@ MOSDOp *Objecter::_prepare_osd_op(Op *o
      m->set_reqid(op->reqid);
    }
  
 +  if (mclock_service_tracker) {
 +    dmc::ReqParams rp = qos_trk->get_req_params(op->target.osd);
 +    m->set_qos_params(rp);
 +  }
 +
    logger->inc(l_osdc_op_send);
-   logger->inc(l_osdc_op_send_bytes, m->get_data().length());
+   ssize_t sum = 0;
+   for (unsigned i = 0; i < m->ops.size(); i++) {
+     sum += m->ops[i].indata.length();
+   }
+   logger->inc(l_osdc_op_send_bytes, sum);
  
    return m;
  }