From: Sage Weil <sage@newdream.net>
Date: Wed, 25 Jan 2012 05:34:27 +0000 (-0800)
Subject: osd: set object_info_t::oid properly when recovering clones
X-Git-Tag: v0.41~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44b11441ad3ef231ff207476bbb0d2e8ab130f26;p=ceph.git

osd: set object_info_t::oid properly when recovering clones

I saw a case (#1973) where the clone had the oid set to the head.  That is
clearly wrong.  Not sure what damage this caused.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f344ad8897e6..1d7fd422ff4a 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5247,6 +5247,7 @@ int ReplicatedPG::recover_primary(int max)
 	    ObjectContext *headobc = get_object_context(head, OLOC_BLANK, false);
 
 	    object_info_t oi(headobc->obs.oi);
+	    oi.soid = soid;
 	    oi.version = latest->version;
 	    oi.prior_version = latest->prior_version;
 	    bufferlist::iterator i = latest->snaps.begin();