From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Feb 2015 01:08:43 +0000 (-0800)
Subject: osd: clear obc cache on_shutdown
X-Git-Tag: v0.93~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=487c2053ebac63b01d559043694dc988aa3ddd80;p=ceph.git

osd: clear obc cache on_shutdown

Fixes: #10892
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 3f0ee679d4885..d41d6e7388457 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10338,6 +10338,7 @@ void ReplicatedPG::on_shutdown()
   pgbackend->on_change();
 
   context_registry_on_change();
+  object_contexts.clear();
 
   osd->remote_reserver.cancel_reservation(info.pgid);
   osd->local_reserver.cancel_reservation(info.pgid);
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 643022ea778c1..f02c287e56fc4 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -1009,7 +1009,7 @@ protected:
       pg(p), obc(o) {}
     void finish(int r) {
       pg->object_context_destructor_callback(obc);
-     }
+    }
   };
 
   int find_object_context(const hobject_t& oid,