From: Sage Weil <sage@newdream.net>
Date: Mon, 22 Dec 2008 20:09:57 +0000 (-0800)
Subject: osd: clear entire pushing map on_change()
X-Git-Tag: v0.6~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85327b74bbdb056609f892375d4d29d29275c437;p=ceph.git

osd: clear entire pushing map on_change()

Primary state is reset; clear pushing map entirely.  We wouldn't know how
to handle the push acks properly anyway.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9cdba6dd737a..392d52f1f482 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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()