From: Sage Weil <sage@inktank.com>
Date: Thu, 21 Feb 2013 18:44:04 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.59~158
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8d0889df59d31656c84f29d0bfa56a6ca14bf32;p=ceph.git

Merge branch 'next'

Conflicts:
	src/osd/ReplicatedPG.cc
---

c8d0889df59d31656c84f29d0bfa56a6ca14bf32
diff --cc src/osd/ReplicatedPG.cc
index 83502de7d124,becba7afab0e..37f34fcb79e8
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -6039,7 -6246,11 +6039,11 @@@ void ReplicatedPG::on_removal(
  {
    dout(10) << "on_removal" << dendl;
    apply_and_flush_repops(false);
 -  remove_watchers_and_notifies();
 +  context_registry_on_change();
+ 
+   clear_primary_state();
+   osd->remove_want_pg_temp(info.pgid);
+   cancel_recovery();
  }
  
  void ReplicatedPG::on_shutdown()