From 1d5011b7ea089a14b5f94b75881b941dae7f5d5d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Dec 2008 10:00:18 -0800 Subject: [PATCH] osd: show prior_version in log dump, output recovery_primary debug output --- src/osd/PG.h | 2 +- src/osd/ReplicatedPG.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index 17291a32a3746..c72db3110901f 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -816,7 +816,7 @@ inline ostream& operator<<(ostream& out, const PG::Info& pgi) inline ostream& operator<<(ostream& out, const PG::Log::Entry& e) { - return out << " " << e.version + return out << " " << e.version << " (" << e.prior_version << ")" << (e.is_delete() ? " - ": (e.is_clone() ? " c ": (e.is_modify() ? " m ": diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cb5783465897f..c3ba3782f9246 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -2641,8 +2641,8 @@ int ReplicatedPG::recover_primary(int max) head.oid.snap = CEPH_NOSNAP; if (missing.is_missing(head.oid) && missing.have_old(head.oid) == latest->prior_version) { - dout(10) << "recover_primary cloning " << head << " to " << poid - << " v" << latest->version + dout(10) << "recover_primary cloning " << head << " v" << latest->prior_version + << " to " << poid << " v" << latest->version << " snaps " << latest->snaps << dendl; ObjectStore::Transaction t; _make_clone(t, head, poid, latest->prior_version, latest->version, -- 2.39.5