From e7d179178e96d9d406503d8338eeaac1401d5739 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Aug 2008 13:57:30 -0700 Subject: [PATCH] objecter: better pg state debug output --- src/osdc/Objecter.cc | 13 +++++++++++++ src/osdc/Objecter.h | 6 +----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index acba49f2d3734..2b7ed2a681903 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -149,6 +149,17 @@ void Objecter::maybe_request_map() } +Objecter::PG &Objecter::get_pg(pg_t pgid) +{ + if (!pg_map.count(pgid)) { + osdmap->pg_to_acting_osds(pgid, pg_map[pgid].acting); + dout(10) << "get_pg " << pgid << " is new, " << pg_map[pgid].acting << dendl; + } else { + dout(10) << "get_pg " << pgid << " is old, " << pg_map[pgid].acting << dendl; + } + return pg_map[pgid]; +} + void Objecter::scan_pgs(set& changed_pgs) { @@ -166,6 +177,8 @@ void Objecter::scan_pgs(set& changed_pgs) if (other == pg.acting) continue; // no change. + + dout(10) << "scan_pgs " << pgid << " " << pg.acting << " -> " << other << dendl; other.swap(pg.acting); diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 2e5d28dec4bec..ddb7561548fa2 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -175,11 +175,7 @@ class Objecter { hash_map pg_map; - PG &get_pg(pg_t pgid) { - if (!pg_map.count(pgid)) - osdmap->pg_to_acting_osds(pgid, pg_map[pgid].acting); - return pg_map[pgid]; - } + PG &get_pg(pg_t pgid); void close_pg(pg_t pgid) { assert(pg_map.count(pgid)); assert(pg_map[pgid].active_tids.empty()); -- 2.39.5