From 6e78e2455c5a9d02ba19ec81f94fa34c98eb88e9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 23 Jun 2011 13:39:11 -0700 Subject: [PATCH] osd: instrument pushes, pull requests Signed-off-by: Sage Weil --- src/osd/OSD.cc | 1 + src/osd/OSD.h | 1 + src/osd/ReplicatedPG.cc | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index d51ca8d4eed74..4edb735a70983 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -675,6 +675,7 @@ void OSD::open_logger() osd_logtype.add_inc(l_osd_sop_push_inb, "sop_push_inb"); osd_logtype.add_inc(l_osd_sop_push_lat, "sop_push_lat"); + osd_logtype.add_inc(l_osd_pull, "pull"); // pull requests sent osd_logtype.add_inc(l_osd_push, "push"); // push osd_logtype.add_inc(l_osd_push_outb, "push_outb"); // pushed bytes diff --git a/src/osd/OSD.h b/src/osd/OSD.h index b52f440d1178c..486d4de17ef44 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -77,6 +77,7 @@ enum { l_osd_sop_push_inb, l_osd_sop_push_lat, + l_osd_pull, l_osd_push, l_osd_push_outb, diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c94a53a1a5b49..52f431ee4237c 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3548,11 +3548,14 @@ void ReplicatedPG::send_pull_op(const sobject_t& soid, eversion_t v, bool first, subop->ops[0].op.op = CEPH_OSD_OP_PULL; subop->data_subset = data_subset; subop->first = first; + // do not include clone_subsets in pull request; we will recalculate this // when the object is pushed back. //subop->clone_subsets.swap(clone_subsets); - osd->cluster_messenger-> - send_message(subop, osd->osdmap->get_cluster_inst(fromosd)); + + osd->cluster_messenger->send_message(subop, osd->osdmap->get_cluster_inst(fromosd)); + + osd->logger->inc(l_osd_pull); } -- 2.39.5