Merge pull request #6183 from oasisprotocol/peternose/trivial/skip-prune-heights

go/consensus/cometbft/abci/prune: Lazy read earliest version

Author: peternose

.changelog/6182.trivial.md

@@ -83,10 +83,6 @@ type StatePruner interface {
 	GetLastRetainedVersion() uint64
 }
 
-type statePrunerInitializer interface {
-	Initialize() error
-}
-
 type nonePruner struct{}
 
 func (p *nonePruner) Prune(uint64) error {
@@ -114,15 +110,6 @@ type genericPruner struct {
 	handlers []consensus.StatePruneHandler
 }
 
-func (p *genericPruner) Initialize() error {
-	// Figure out the eldest version currently present in the tree.
-	p.earliestVersion = p.ndb.GetEarliestVersion()
-	// Initially, the earliest version is the last retained version.
-	p.lastRetainedVersion = p.earliestVersion
-
-	return nil
-}
-
 func (p *genericPruner) GetLastRetainedVersion() uint64 {
 	p.Lock()
 	defer p.Unlock()
@@ -133,6 +120,15 @@ func (p *genericPruner) Prune(latestVersion uint64) error {
 	if latestVersion < p.keepN {
 		return nil
 	}
+	if p.earliestVersion == 0 {
+		// Figure out the eldest version currently present in the tree.
+		p.earliestVersion = p.ndb.GetEarliestVersion()
+		// Initially, the earliest version is the last retained version.
+		p.lastRetainedVersion = p.earliestVersion
+	}
+	if p.earliestVersion == 0 {
+		return nil
+	}
 
 	p.logger.Debug("Prune: Start",
 		"latest_version", latestVersion,
@@ -231,13 +227,7 @@ func newStatePruner(cfg *PruneConfig, ndb nodedb.NodeDB) (StatePruner, error) {
 		return nil, fmt.Errorf("abci/pruner: unsupported pruning strategy: %v", cfg.Strategy)
 	}
 
-	if initializer, ok := statePruner.(statePrunerInitializer); ok {
-		if err := initializer.Initialize(); err != nil {
-			return nil, err
-		}
-	}
-
-	logger.Debug("ABCI state pruner initialized",
+	logger.Debug("ABCI state pruner created",
 		"strategy", cfg.Strategy,
 		"num_kept", cfg.NumKept,
 	)

go/consensus/cometbft/abci/prune.go

@@ -45,26 +45,20 @@ func TestPruneKeepN(t *testing.T) {
 		require.NoError(err, "Finalize")
 	}
 
-	earliestVersion := ndb.GetEarliestVersion()
-	require.EqualValues(1, earliestVersion, "earliest version should be correct")
-	latestVersion, exists := ndb.GetLatestVersion()
-	require.EqualValues(11, latestVersion, "latest version should be correct")
-	require.True(exists, "latest version should exist")
-
 	pruner, err := newStatePruner(&PruneConfig{
 		Strategy: PruneKeepN,
 		NumKept:  2,
 	}, ndb)
 	require.NoError(err, "newStatePruner failed")
 
-	earliestVersion = ndb.GetEarliestVersion()
+	earliestVersion := ndb.GetEarliestVersion()
 	require.EqualValues(1, earliestVersion, "earliest version should be correct")
-	latestVersion, exists = ndb.GetLatestVersion()
+	latestVersion, exists := ndb.GetLatestVersion()
 	require.EqualValues(11, latestVersion, "latest version should be correct")
 	require.True(exists, "latest version should exist")
 
 	lastRetainedVersion := pruner.GetLastRetainedVersion()
-	require.EqualValues(1, lastRetainedVersion, "last retained version should be correct")
+	require.Zero(lastRetainedVersion, "last retained version should not be set")
 
 	err = pruner.Prune(11)
 	require.NoError(err, "Prune")