]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
filestore: Clear objects before calling collection_list() again
authorDavid Zafman <dzafman@redhat.com>
Wed, 3 Aug 2016 06:26:41 +0000 (23:26 -0700)
committerDavid Zafman <dzafman@redhat.com>
Wed, 3 Aug 2016 06:55:35 +0000 (23:55 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/os/filestore/FileStore.cc

index d91eab978c318162c8b764f826e5a6c759928070..21b8230718a1770e376e0a3bca0629a0ff72e259 100644 (file)
@@ -4575,6 +4575,7 @@ int FileStore::_collection_remove_recursive(const coll_t &cid,
       if (r < 0)
        return r;
     }
+    objects.clear();
   }
   return _destroy_collection(cid);
 }