From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 20 Nov 2017 06:39:17 +0000 (+0800)
Subject: Merge pull request #18810 from majianpeng/fix-21982
X-Git-Tag: v13.0.1~160
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb7dc94fbec06c5e8cf6620617b30918c31f2e58;p=ceph.git

Merge pull request #18810 from majianpeng/fix-21982

osdc/Objecter: record correctly value for l_osdc_op_send_bytes.

Reviewed-by: Sage Weil <sage@redhat.com>
---

cb7dc94fbec06c5e8cf6620617b30918c31f2e58
diff --cc src/osdc/Objecter.cc
index 310e14bd4b92,c6d26d84948e..03baa7800475
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -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;
  }