]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDMap: fix deepish_copy_from
authorSage Weil <sage@inktank.com>
Wed, 29 Jan 2014 02:46:37 +0000 (18:46 -0800)
committerSage Weil <sage@inktank.com>
Wed, 29 Jan 2014 02:46:37 +0000 (18:46 -0800)
Start with a shallow copy!

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSDMap.h

index d7a479c3923b3fa84063a47263b900277be28b2e..a0237e3f1ef793fee5b6ae040c13889d76c2ab17 100644 (file)
@@ -249,6 +249,7 @@ public:
   */
 
   void deepish_copy_from(const OSDMap& o) {
+    *this = o;
     primary_temp.reset(new map<pg_t,int>(*o.primary_temp));
     pg_temp.reset(new map<pg_t,vector<int> >(*o.pg_temp));
     osd_uuid.reset(new vector<uuid_d>(*o.osd_uuid));