mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/bitmap-fix-pack-reuse'

Browse Source 
Code to reuse objects based on bitmap contents have been tightened
to avoid race condition even when multiple packs are involved.

* tb/bitmap-fix-pack-reuse:
  pack-bitmap.c: ensure pack validity for all reuse packs
This commit is contained in:
Junio C Hamano 2024-12-23 09:32:22 -08:00
commit a08ebf8b3e
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pack-bitmap.c
View File

@ -398,8 +398,7 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
struct stat st; struct stat st;
char *bitmap_name = midx_bitmap_filename(midx); char *bitmap_name = midx_bitmap_filename(midx);
int fd = git_open(bitmap_name); int fd = git_open(bitmap_name);
uint32_t i, preferred_pack; uint32_t i;
struct packed_git *preferred;
if (fd < 0) { if (fd < 0) {
if (errno != ENOENT) if (errno != ENOENT)
@ -456,18 +455,6 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
} }
} }
if (midx_preferred_pack(bitmap_git->midx, &preferred_pack) < 0) {
warning(_("could not determine MIDX preferred pack"));
goto cleanup;
}
preferred = bitmap_git->midx->packs[preferred_pack];
if (!is_pack_valid(preferred)) {
warning(_("preferred pack (%s) is invalid"),
preferred->pack_name);
goto cleanup;
}
return 0; return 0;
cleanup: cleanup:
@ -2306,8 +2293,10 @@ void reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
if (!pack.bitmap_nr) if (!pack.bitmap_nr)
continue; continue;
if (is_pack_valid(pack.p)) {
ALLOC_GROW(packs, packs_nr + 1, packs_alloc); ALLOC_GROW(packs, packs_nr + 1, packs_alloc);
memcpy(&packs[packs_nr++], &pack, sizeof(pack)); memcpy(&packs[packs_nr++], &pack, sizeof(pack));
}
objects_nr += pack.p->num_objects; objects_nr += pack.p->num_objects;
} }
@ -2341,16 +2330,22 @@ void reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
pack_int_id = -1; pack_int_id = -1;
} }
if (is_pack_valid(pack)) {
ALLOC_GROW(packs, packs_nr + 1, packs_alloc); ALLOC_GROW(packs, packs_nr + 1, packs_alloc);
packs[packs_nr].p = pack; packs[packs_nr].p = pack;
packs[packs_nr].pack_int_id = pack_int_id; packs[packs_nr].pack_int_id = pack_int_id;
packs[packs_nr].bitmap_nr = pack->num_objects; packs[packs_nr].bitmap_nr = pack->num_objects;
packs[packs_nr].bitmap_pos = 0; packs[packs_nr].bitmap_pos = 0;
packs[packs_nr].from_midx = bitmap_git->midx; packs[packs_nr].from_midx = bitmap_git->midx;
packs_nr++;
objects_nr = packs[packs_nr++].bitmap_nr;
} }
objects_nr = pack->num_objects;
}
if (!packs_nr)
return;
word_alloc = objects_nr / BITS_IN_EWORD; word_alloc = objects_nr / BITS_IN_EWORD;
if (objects_nr % BITS_IN_EWORD) if (objects_nr % BITS_IN_EWORD)
word_alloc++; word_alloc++;