From: Sage Weil <sage@inktank.com>
Date: Sat, 1 Feb 2014 05:16:54 +0000 (-0800)
Subject: osd: clear agent state when PG becomes a replica
X-Git-Tag: v0.78~166^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=230aad7baa855f4b684b3ca5c973fdced89fb371;p=ceph.git

osd: clear agent state when PG becomes a replica

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 14242b74c2d8..588dd5167fa5 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5955,6 +5955,8 @@ PG::RecoveryState::ReplicaActive::ReplicaActive(my_context ctx)
     context< RecoveryMachine >().get_cur_transaction(),
     context< RecoveryMachine >().get_on_applied_context_list(),
     context< RecoveryMachine >().get_on_safe_context_list());
+
+  pg->agent_clear();
 }
 
 
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 3eaebf0c7e36..064abb266986 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1931,6 +1931,7 @@ public:
 
   virtual void agent_work(int max) = 0;
   virtual void agent_stop() = 0;
+  virtual void agent_clear() = 0;
 };
 
 ostream& operator<<(ostream& out, const PG& pg);