From 42681223d00cdf8feff6b10f99f3ceaa92f8171d Mon Sep 17 00:00:00 2001
From: Aleksey Savchuk <a.savchuk@yadro.com>
Date: Wed, 18 Dec 2024 12:37:02 +0300
Subject: [PATCH] [#1445] shard/gc: Remove graves

Signed-off-by: Aleksey Savchuk <a.savchuk@yadro.com>
---
 pkg/local_object_storage/shard/gc.go | 38 ++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkg/local_object_storage/shard/gc.go b/pkg/local_object_storage/shard/gc.go
index 622a0a28f..90e03cbc0 100644
--- a/pkg/local_object_storage/shard/gc.go
+++ b/pkg/local_object_storage/shard/gc.go
@@ -534,9 +534,12 @@ func (s *Shard) collectExpiredGraves(ctx context.Context, e Event) {
 	log.Debug(ctx, logs.ShardStartedExpiredTombstonesHandling)
 	defer log.Debug(ctx, logs.ShardFinishedExpiredTombstonesHandling)
 
+	// TODO(@a-savchuk): Magic number. Should it be configurable? Same way
+	// it's done for handling expired objects: batch size and worker count.
 	const tssDeleteBatch = 50
 	tss := make([]meta.TombstonedObject, 0, tssDeleteBatch)
-	tssExp := make([]meta.TombstonedObject, 0, tssDeleteBatch)
+	expiredGravesWithExpEpoch := make([]meta.TombstonedObject, 0, tssDeleteBatch)
+	expiredGravesWithoutExpEpoch := make([]meta.TombstonedObject, 0, tssDeleteBatch)
 
 	var iterPrm meta.GraveyardIterationPrm
 	iterPrm.SetHandler(func(deletedObject meta.TombstonedObject) error {
@@ -577,22 +580,41 @@ func (s *Shard) collectExpiredGraves(ctx context.Context, e Event) {
 		}
 
 		for _, ts := range tss {
-			if !s.tsSource.IsTombstoneAvailable(ctx, ts.Tombstone(), epoch) {
-				tssExp = append(tssExp, ts)
+			if ts.ExpirationEpoch() != meta.NoExpirationEpoch {
+				expiredGravesWithExpEpoch = append(expiredGravesWithExpEpoch, ts)
+			} else if !s.tsSource.IsTombstoneAvailable(ctx, ts.Tombstone(), epoch) {
+				expiredGravesWithoutExpEpoch = append(expiredGravesWithoutExpEpoch, ts)
 			}
 		}
 
-		log.Debug(ctx, logs.ShardHandlingExpiredTombstonesBatch, zap.Int("number", len(tssExp)))
-		if len(tssExp) > 0 {
-			s.expiredGravesCallback(ctx, tssExp)
-		}
+		log.Debug(ctx, logs.ShardHandlingExpiredTombstonesBatch,
+			zap.Int("with exp. epoch", len(expiredGravesWithExpEpoch)),
+			zap.Int("without exp. epoch", len(expiredGravesWithoutExpEpoch)),
+		)
+
+		s.handleExpiredGraves(ctx, expiredGravesWithExpEpoch, expiredGravesWithoutExpEpoch)
 
 		iterPrm.SetOffset(tss[tssLen-1].Address())
 		tss = tss[:0]
-		tssExp = tssExp[:0]
+		expiredGravesWithExpEpoch = expiredGravesWithExpEpoch[:0]
+		expiredGravesWithoutExpEpoch = expiredGravesWithoutExpEpoch[:0]
 	}
 }
 
+func (s *Shard) handleExpiredGraves(ctx context.Context,
+	expiredWithExpEpoch []meta.TombstonedObject, expiredWithoutExpEpoch []meta.TombstonedObject,
+) {
+	if len(expiredWithExpEpoch) > 0 {
+		s.removeGraves(ctx, expiredWithExpEpoch)
+	}
+	if len(expiredWithoutExpEpoch) > 0 {
+		s.expiredGravesCallback(ctx, expiredWithoutExpEpoch)
+	}
+}
+
+func (s *Shard) removeGraves(_ context.Context, _ []meta.TombstonedObject) {
+}
+
 func (s *Shard) getExpiredObjects(ctx context.Context, epoch uint64, onExpiredFound func(*meta.ExpiredObject)) error {
 	s.m.RLock()
 	defer s.m.RUnlock()