]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: clear entire pushing map on_change()
authorSage Weil <sage@newdream.net>
Mon, 22 Dec 2008 20:09:57 +0000 (12:09 -0800)
committerSage Weil <sage@newdream.net>
Tue, 23 Dec 2008 20:19:09 +0000 (12:19 -0800)
Primary state is reset; clear pushing map entirely.  We wouldn't know how
to handle the push acks properly anyway.

src/osd/ReplicatedPG.cc

index 9cdba6dd737acaa77d3b1edec7e0fd6938568f5c..392d52f1f482c8771fb8dba0bb288fe02545e555 100644 (file)
@@ -2584,6 +2584,9 @@ void ReplicatedPG::on_change()
     }
   }
   
+  // clear pushing map
+  pushing.clear();
+  /*
   // remove strays from pushing map
   {
     map<object_t, set<int> >::iterator p = pushing.begin();
@@ -2608,6 +2611,7 @@ void ReplicatedPG::on_change()
        p++;    
     }
   }
+  */
 }
 
 void ReplicatedPG::on_role_change()