Skip to content

Commit 2dd4fed

Browse files
szedergitster
authored andcommitted
commit-graph: check chunk sizes after writing
In my experience while experimenting with new commit-graph chunks, early versions of the corresponding new write_commit_graph_my_chunk() functions are, sadly but not surprisingly, often buggy, and write more or less data than they are supposed to, especially if the chunk size is not directly proportional to the number of commits. This then causes all kinds of issues when reading such a bogus commit-graph file, raising the question of whether the writing or the reading part happens to be buggy this time. Let's catch such issues early, already when writing the commit-graph file, and check that each write_graph_chunk_*() function wrote the amount of data that it was expected to, and what has been encoded in the Chunk Lookup table. Now that all commit-graph chunks are written in a loop we can do this check in a single place for all chunks, and any chunks added in the future will get checked as well. Helped-by: René Scharfe <[email protected]> Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 17e6275 commit 2dd4fed

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

commit-graph.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,8 +1693,15 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
16931693
}
16941694

16951695
for (i = 0; i < num_chunks; i++) {
1696+
uint64_t start_offset = f->total + f->offset;
1697+
16961698
if (chunks[i].write_fn(f, ctx))
16971699
return -1;
1700+
1701+
if (f->total + f->offset != start_offset + chunks[i].size)
1702+
BUG("expected to write %"PRId64" bytes to chunk %"PRIx32", but wrote %"PRId64" instead",
1703+
chunks[i].size, chunks[i].id,
1704+
f->total + f->offset - start_offset);
16981705
}
16991706

17001707
stop_progress(&ctx->progress);

0 commit comments

Comments
 (0)