From: Sage Weil <sage@redhat.com>
Date: Tue, 13 Jan 2015 01:46:58 +0000 (-0800)
Subject: os/FileStore: do not mange temp collection
X-Git-Tag: v9.0.3~52^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2f8a37f5e821450b1d07e25784601945fa70bc0;p=ceph.git

os/FileStore: do not mange temp collection

We may get these e.g. when FileStore::init_temp_collections is clearing
out old temp objects.

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

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 2892063aeeb..6d83780da27 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -141,7 +141,7 @@ private:
   int init_index(coll_t c);
 
   void _kludge_temp_object_collection(coll_t& cid, ghobject_t& oid) {
-    if (oid.hobj.pool < -1)
+    if (oid.hobj.pool < -1 && !cid.is_temp())
       cid = cid.get_temp();
   }
   void init_temp_collections();