summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-07-31 19:51:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-02 16:27:26 (GMT)
commit7c3ecb32541d767518bf78633603f94fefdac8cf (patch)
treebf5ca4bc5f1b7d5f0b7451e8b737c9fc1ffe4db3 /builtin/pack-objects.c
parent88d0db55579cd2173ce641849066da8b897b58da (diff)
downloadgit-7c3ecb32541d767518bf78633603f94fefdac8cf.zip
git-7c3ecb32541d767518bf78633603f94fefdac8cf.tar.gz
git-7c3ecb32541d767518bf78633603f94fefdac8cf.tar.bz2
Don't close pack fd when free'ing pack windows
Now that close_one_pack() has been introduced to handle file descriptor pressure, it is not strictly necessary to close the pack file descriptor in unuse_one_window() when we're under memory pressure. Jeff King provided a justification for leaving the pack file open: If you close packfile descriptors, you can run into racy situations where somebody else is repacking and deleting packs, and they go away while you are trying to access them. If you keep a descriptor open, you're fine; they last to the end of the process. If you don't, then they disappear from under you. For normal object access, this isn't that big a deal; we just rescan the packs and retry. But if you are packing yourself (e.g., because you are a pack-objects started by upload-pack for a clone or fetch), it's much harder to recover (and we print some warnings). Let's do so (or uh, not do so). Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f069462..4eb0521 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1809,7 +1809,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
static void try_to_free_from_threads(size_t size)
{
read_lock();
- release_pack_memory(size, -1);
+ release_pack_memory(size);
read_unlock();
}