global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 02:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

reftable/stack: update stats on failed full compaction

Browse Source 
When auto-compaction fails due to a locking error, we update the
statistics to indicate this failure. We're not doing the same when
performing a full compaction.

Fix this inconsistency by using `stack_compact_range_stats()`, which
handles the stat update for us.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-08 16:06:34 +02:00
committed by Junio C Hamano
parent 8030100bda
commit 5f0ed603a1
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
reftable/stack.c
View File

@@ -1205,13 +1205,6 @@ done:
return err;
}
int reftable_stack_compact_all(struct reftable_stack *st,
struct reftable_log_expiry_config *config)
{
return stack_compact_range(st, 0, st->merged->stack_len ?
st->merged->stack_len - 1 : 0, config);
}
static int stack_compact_range_stats(struct reftable_stack *st,
size_t first, size_t last,
struct reftable_log_expiry_config *config)
@@ -1222,6 +1215,13 @@ static int stack_compact_range_stats(struct reftable_stack *st,
return err;
}
int reftable_stack_compact_all(struct reftable_stack *st,
struct reftable_log_expiry_config *config)
{
size_t last = st->merged->stack_len ? st->merged->stack_len - 1 : 0;
return stack_compact_range_stats(st, 0, last, config);
}
static int segment_size(struct segment *s)
{
return s->end - s->start;

3
reftable/stack_test.c
View File

@@ -1005,8 +1005,7 @@ static void test_reftable_stack_compaction_with_locked_tables(void)
*/
err = reftable_stack_compact_all(st, NULL);
EXPECT(err == REFTABLE_LOCK_ERROR);
/* TODO: this is wrong, we should get notified about the failure. */
EXPECT(st->stats.failures == 0);
EXPECT(st->stats.failures == 1);
EXPECT(st->merged->stack_len == 3);
reftable_stack_destroy(st);