]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/FileStore: do not mange temp collection
authorSage Weil <sage@redhat.com>
Tue, 13 Jan 2015 01:46:58 +0000 (17:46 -0800)
committerSage Weil <sage@redhat.com>
Fri, 19 Jun 2015 00:02:48 +0000 (17:02 -0700)
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>
src/os/FileStore.h

index 2892063aeeb0739112d342e730c2fd204880e1b8..6d83780da27cd63c69c99aa6bdc7195887128bd5 100644 (file)
@@ -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();