address all last nits and concerns (@walldiss @vgonkivs)

celestiaorg · Jan 17, 2025 · 8654085 · 8654085
1 parent fce29c6
commit 8654085
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/nodebuilder/pruner/migration_utils.go b/nodebuilder/pruner/migration_utils.go
@@ -16,7 +16,7 @@ import (
 
 var (
 	storePrefix     = datastore.NewKey("full_avail")
-	previousModeKey = datastore.NewKey("previous_run")
+	previousModeKey = datastore.NewKey("previous_mode")
 )
 
 // detectFirstRun is a temporary function that serves to assist migration to the refactored pruner

diff --git a/nodebuilder/pruner/module.go b/nodebuilder/pruner/module.go
@@ -123,8 +123,12 @@ func convertToPruned() fx.Option {
 			return err
 		}
 
+		// if we convert the node from archival to pruned, we need to reset the checkpoint
+		// to ensure the node goes back and deletes *all* blocks older than the
+		// availability window, as archival "pruning" only trims the .q4 file,
+		// but retains the ODS.
 		if convert {
-			return p.ClearCheckpoint(ctx)
+			return p.ResetCheckpoint(ctx)
 		}
 
 		return nil

diff --git a/nodebuilder/tests/prune_test.go b/nodebuilder/tests/prune_test.go
@@ -1,3 +1,5 @@
+//go:build pruning || integration
+
 package tests
 
 import (

diff --git a/pruner/service.go b/pruner/service.go
@@ -102,7 +102,7 @@ func (s *Service) LastPruned(ctx context.Context) (uint64, error) {
 	return s.checkpoint.LastPrunedHeight, nil
 }
 
-func (s *Service) ClearCheckpoint(ctx context.Context) error {
+func (s *Service) ResetCheckpoint(ctx context.Context) error {
 	s.checkpoint = newCheckpoint()
 	return storeCheckpoint(ctx, s.ds, s.checkpoint)
 }

diff --git a/pruner/service_test.go b/pruner/service_test.go
@@ -313,7 +313,7 @@ func TestService_ClearCheckpoint(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, oldCp, serv.checkpoint)
 
-	err = serv.ClearCheckpoint(ctx)
+	err = serv.ResetCheckpoint(ctx)
 	require.NoError(t, err)
 
 	err = serv.loadCheckpoint(ctx)

diff --git a/share/availability/full/utils.go b/share/availability/full/utils.go
@@ -11,7 +11,7 @@ import (
 
 var (
 	storePrefix     = datastore.NewKey("full_avail")
-	previousModeKey = datastore.NewKey("previous_run")
+	previousModeKey = datastore.NewKey("previous_mode")
 	pruned          = []byte("pruned")
 	archival        = []byte("archival")
 )