From: Samuel Just <samuel.just@dreamhost.com>
Date: Wed, 4 May 2011 00:02:34 +0000 (-0700)
Subject: PG: ActMap should be dicarded if no outer state handles it
X-Git-Tag: v0.28~74^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dda3261efe34fe75c3b4193ed8df4d72de3002da;p=ceph.git

PG: ActMap should be dicarded if no outer state handles it
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 8fe272102ea9..47525d715491 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3957,7 +3957,7 @@ PG::RecoveryState::ReplicaActive::react(const ActMap&) {
     context< RecoveryMachine >().send_notify(pg->get_primary(),
 					     pg->info);
   }
-  return forward_event();
+  return discard_event();
 }
 
 /*-------Stray---*/
@@ -4055,7 +4055,7 @@ PG::RecoveryState::Stray::react(const ActMap&) {
     context< RecoveryMachine >().send_notify(pg->get_primary(),
 					     pg->info);
   }
-  return forward_event();
+  return discard_event();
 }
 
 /*--------GetInfo---------*/