[PATCH v2 05/15] refs/reftable: print errors on compaction failure
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Mar 25, 2024, 10:02 UTC
- Message-ID
- <6615f25b0890c934a31902bed024eaa9146ec641.1711360631.git.ps@pks.im>
- In-Reply-To
- <cover.1711360631.git.ps@pks.im>
When git-pack-refs(1) fails in the reftable backend we end up printing no error message at all, leaving the caller puzzled as to why compaction has failed. Fix this.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- refs/reftable-backend.c | 6 +++++- t/t0610-reftable-basics.sh | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index e206d5a073..694dc4845f 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -1204,8 +1204,12 @@ static int reftable_be_pack_refs(struct ref_store *ref_store, stack = refs->main_stack; ret = reftable_stack_compact_all(stack, NULL); - if (ret) + if (ret < 0) { + ret = error(_("unable to compact stack: %s"), + reftable_error_str(ret)); goto out; + } + ret = reftable_stack_clean(stack); if (ret) goto out; diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh index 5f2f9baa9b..a53d1dc493 100755 --- a/t/t0610-reftable-basics.sh +++ b/t/t0610-reftable-basics.sh @@ -375,6 +375,18 @@ test_expect_success 'pack-refs: compacts tables' ' test_line_count = 1 repo/.git/reftable/tables.list ' +test_expect_success 'pack-refs: compaction raises locking errors' ' + test_when_finished "rm -rf repo" && + git init repo && + test_commit -C repo A && + touch repo/.git/reftable/tables.list.lock && + cat >expect <<-EOF && + error: unable to compact stack: data is locked + EOF + test_must_fail git -C repo pack-refs 2>err && + test_cmp expect err +' + test_expect_success 'pack-refs: prunes stale tables' ' test_when_finished "rm -rf repo" && git init repo &&
-- 2.44.GIT