Skip to content

Commit

Permalink
Fix index preloading for racy dirty case
Browse files Browse the repository at this point in the history
In the threaded index preloading case, we must be sure to always use the
CE_MATCH_RACY_IS_DIRTY flag when calling ie_match_stat(), in order to make
sure that we only ever look at the stat() data, and don't try to do
anything fancy.

Because most of git internals are not thread-safe, and must not be called
in parallel.

Otherwise, what happens is that if the timestamps indicate that an entry
_might_ be dirty, we might start actually comparing filesystem data with
the object database. And we mustn't do that, because that would involve
looking up and creating the object structure, and that whole code sequence
with read_sha1_file() where we look up and add objects to the hashes is
definitely not thread-safe.

Nor do we want to add locking, because the whole point of the preload was
to be simple and not affect anything else. With CE_MATCH_RACY_IS_DIRTY, we
get what we wanted, and we'll just leave the hard cases well alone, to be
done later in the much simpler serial case.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Linus Torvalds authored and Junio C Hamano committed Nov 17, 2008
1 parent 671c9b7 commit 7c4ea59
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion preload-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static void *preload_thread(void *_data)
continue;
if (lstat(ce->name, &st))
continue;
if (ie_match_stat(index, ce, &st, 0))
if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY))
continue;
ce_mark_uptodate(ce);
} while (--nr > 0);
Expand Down

0 comments on commit 7c4ea59

Please sign in to comment.