On Tue, 10 Feb 2009, Shawn O. Pearce wrote: > Daniel Barkalow <barkalow@xxxxxxxxxxxx> wrote: > > > > Is there some easy way to tell what object it was having problems with > > when it failed to unpack? I've got a whole lot of objects. > > Can you use gdb to find it? If so, walk up the stack into > fast-import.c's load_tree() function and look at sha1 here, > and also, *myoe. Okay, sha1 is 961a2199..., which is correct as a delta against the tree of size 151 at offset 12 of its own pack; the bogus thing seems to be the base_size (and presumably base). > > The expected size of the base is 1882, while the actual size is 151. The > > base offset it found was 12. > > > > I'm using "checkpoint" a lot, so I've got 24 packs. Two of them have tree > > objects of size 1882 at offset 12; a different one has a tree object of > > size 151 at offset 12. The one with the object of size 151 was the one > > that was still open at the end. There's no tree of size 1882 in this pack, > > nor in any other pack that has a tree of size 151. > > > > So maybe it's right about the offsets and all, but it's confused about > > which pack something was in? Maybe it cached something when the pack > > containing the object it wants was open, and it ended up thinking it was > > in the pack that's now open rather than the pack that was open and is now > > closed? > > fast-import keeps all of its object data in a single table of > "struct object_entry", the table is keyed by SHA-1. Each entry > has a pack_id, which tells it which pack this object is in, and > the offset of the object within that pack. > > Sounds like maybe its confusing the pack pointer in the all_packs > array (see gfi_unpack_entry). I think maybe there's aliasing in the delta base cache? If it recycled a struct packed_git, the cache would come up with a cached tree at offset 12 of the packed_git at that address, but the pack used by that struct has changed. I don't see any reason that the situation couldn't arise where you start a pack, look up an object in it while it's still open but the object isn't in the window, cache the delta base, end that packfile, eventually start a packfile that gets allocated in the space that was freed, produce a new delta against the object at exactly the same offset of the new pack (with the same address as the old pack), and go on happily until you try looking up this last delta and pull the wrong base out of the cache. I don't see any code to flush the delta cache ever, but it's hard to get a new packed_git allocated at the address of a freed one, except by doing a lot of checkpoints in fast-import... -Daniel *This .sig left intentionally blank* -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
