@matheusbsbs / matheus-bagliano / commits / 0e1b9c5eed

reftable: adapt write_object_record() to propagate block_writer_add() errors

Previously, write_object_record() would flush the current block and retry appending the record whenever block_writer_add() returned any nonzero error. This forced an assumption that every failure meant the block was full, even when errors such as memory allocation or I/O failures occurred. Update the write_object_record() to inspect the error code returned by block_writer_add() and flush and reinitialize the writer iff the error is REFTABLE_ENTRY_TOO_BIG_ERROR. For any other error, immediately propagate it. If the flush and reinitialization still fail with REFTABLE_ENTRY_TOO_BIG_ERROR, reset the record's offset length to zero before a final attempt. All call sites now handle various error codes returned by block_writer_add(). Signed-off-by: Meet Soni <meetsoni3017@gmail.com> Acked-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Meet Soni committed Mar 19, 2025 at 20:59 UTC 0e1b9c5eed8bfc091570cc93bd15d3c235d15971

1 file changed +19

reftable/writer.c

+19

@@ -620,10 +620,22 @@ static void write_object_record(void *void_arg, void *key)

620 if (arg->err < 0)

621 goto done;

622

623 + /*

624 + * Try to add the record to the writer. If this succeeds then we're

625 + * done. Otherwise the block writer may have hit the block size limit

626 + * and needs to be flushed.

627 + */

628 arg->err = block_writer_add(arg->w->block_writer, &rec);

629 if (arg->err == 0)

630 goto done;

631

632 + if (arg->err != REFTABLE_ENTRY_TOO_BIG_ERROR)

633 + goto done;

634 +

635 + /*

636 + * The current block is full, so we need to flush and reinitialize the

637 + * writer to start writing the next block.

638 + */

639 arg->err = writer_flush_block(arg->w);

640 if (arg->err < 0)

641 goto done;

@@ -632,10 +644,17 @@ static void write_object_record(void *void_arg, void *key)

644 if (arg->err < 0)

645 goto done;

646

647 + /*

648 + * If this still fails then we may need to reset record's offset

649 + * length to reduce the data size to be written.

650 + */

651 arg->err = block_writer_add(arg->w->block_writer, &rec);

652 if (arg->err == 0)

653 goto done;

654

655 + if (arg->err != REFTABLE_ENTRY_TOO_BIG_ERROR)

656 + goto done;

657 +

658 rec.u.obj.offset_len = 0;

659 arg->err = block_writer_add(arg->w->block_writer, &rec);

660