From: Samuel Just <sam.just@inktank.com>
Date: Sun, 10 Mar 2013 19:50:01 +0000 (-0700)
Subject: ReplicatedPG: don't leak reservation on removal
X-Git-Tag: v0.56.4~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50d2d4a77f339d489703c1125dc5c1159d08ca8a;p=ceph.git

ReplicatedPG: don't leak reservation on removal

Fixes: 4431
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 32bf131e0141faf407b5ff993f75f97516b27c12)

Conflicts:

	src/osd/ReplicatedPG.cc
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 8152240102cf..938715dbf08b 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6246,6 +6246,9 @@ void ReplicatedPG::on_removal()
   dout(10) << "on_removal" << dendl;
   apply_and_flush_repops(false);
   remove_watchers_and_notifies();
+
+  osd->remote_reserver.cancel_reservation(info.pgid);
+  osd->local_reserver.cancel_reservation(info.pgid);
 }
 
 void ReplicatedPG::on_shutdown()