added error check for updating meta state

multiversx · Apr 24, 2024 · d38a478 · d38a478
1 parent 0078764
commit d38a478
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/process/blocksPool.go b/process/blocksPool.go
@@ -80,7 +80,8 @@ func (bp *blocksPool) Get(key []byte) ([]byte, error) {
 	return bp.storer.Get(key)
 }
 
-func (bp *blocksPool) UpdateMetaState(checkpoint *data.BlockCheckpoint) {
+// UpdateMetaState will update internal meta state
+func (bp *blocksPool) UpdateMetaState(checkpoint *data.BlockCheckpoint) error {
 	index, ok := checkpoint.LastRounds[core.MetachainShardId]
 	if !ok {
 		index = initIndex
@@ -89,14 +90,16 @@ func (bp *blocksPool) UpdateMetaState(checkpoint *data.BlockCheckpoint) {
 	if index >= bp.firstCommitableBlock {
 		err := bp.setCheckpoint(checkpoint)
 		if err != nil {
-			log.Warn("failed to set checkpoint", "error", err.Error())
+			return fmt.Errorf("%w, failed to set checkpoint", err)
 		}
 	}
 
 	err := bp.pruneStorer(index)
 	if err != nil {
-		log.Warn("failed to prune storer", "error", err.Error())
+		return fmt.Errorf("%w, failed to prune storer", err)
 	}
+
+	return nil
 }
 
 func (bp *blocksPool) pruneStorer(index uint64) error {

diff --git a/process/dataProcessor.go b/process/dataProcessor.go
@@ -83,8 +83,6 @@ func (dp *dataProcessor) saveBlock(marshalledData []byte) error {
 		return ErrNilOutportBlockData
 	}
 
-	log.Info("saving block", "hash", outportBlock.BlockData.GetHeaderHash(), "shardID", outportBlock.ShardID)
-
 	if outportBlock.ShardID == core.MetachainShardId {
 		return dp.handleMetaOutportBlock(outportBlock)
 	}
@@ -105,6 +103,11 @@ func (dp *dataProcessor) handleMetaOutportBlock(outportBlock *outport.OutportBlo
 	}
 	metaRound := metaOutportBlock.BlockData.Header.GetRound()
 
+	log.Info("saving meta outport block",
+		"hash", metaOutportBlock.BlockData.GetHeaderHash(),
+		"round", metaRound,
+		"shardID", metaOutportBlock.ShardID)
+
 	headerHash := outportBlock.BlockData.HeaderHash
 	err = dp.outportBlocksPool.PutMetaBlock(headerHash, metaOutportBlock)
 	if err != nil {
@@ -122,7 +125,10 @@ func (dp *dataProcessor) handleMetaOutportBlock(outportBlock *outport.OutportBlo
 				core.MetachainShardId: metaRound,
 			},
 		}
-		dp.outportBlocksPool.UpdateMetaState(lastCheckpoint)
+		err = dp.outportBlocksPool.UpdateMetaState(lastCheckpoint)
+		if err != nil {
+			return err
+		}
 
 		return nil
 	}
@@ -142,9 +148,7 @@ func (dp *dataProcessor) handleMetaOutportBlock(outportBlock *outport.OutportBlo
 		return err
 	}
 
-	dp.outportBlocksPool.UpdateMetaState(lastCheckpoint)
-
-	return nil
+	return dp.outportBlocksPool.UpdateMetaState(lastCheckpoint)
 }
 
 // TODO: update to use latest data structures
@@ -175,6 +179,12 @@ func (dp *dataProcessor) handleShardOutportBlock(outportBlock *outport.OutportBl
 	if shardOutportBlock.BlockData.Header == nil {
 		return fmt.Errorf("%w for blockData header", ErrInvalidOutportBlock)
 	}
+	round := shardOutportBlock.BlockData.Header.GetRound()
+
+	log.Info("saving shard outport block",
+		"hash", shardOutportBlock.BlockData.GetHeaderHash(),
+		"round", round,
+		"shardID", shardOutportBlock.ShardID)
 
 	headerHash := outportBlock.BlockData.HeaderHash
 

diff --git a/process/hyperBlocksPool.go b/process/hyperBlocksPool.go
@@ -31,8 +31,8 @@ func NewHyperOutportBlocksPool(
 }
 
 // UpdateMetaState will triiger meta state update from base data pool
-func (bp *hyperOutportBlocksPool) UpdateMetaState(checkpoint *data.BlockCheckpoint) {
-	bp.dataPool.UpdateMetaState(checkpoint)
+func (bp *hyperOutportBlocksPool) UpdateMetaState(checkpoint *data.BlockCheckpoint) error {
+	return bp.dataPool.UpdateMetaState(checkpoint)
 }
 
 // Get will trigger data pool get operation

diff --git a/process/interface.go b/process/interface.go
@@ -61,7 +61,7 @@ type DataPool interface {
 	Put(key []byte, value []byte) error
 	Get(key []byte) ([]byte, error)
 	PutBlock(hash []byte, value []byte, round uint64, shardID uint32) error
-	UpdateMetaState(checkpoint *data.BlockCheckpoint)
+	UpdateMetaState(checkpoint *data.BlockCheckpoint) error
 	Close() error
 	IsInterfaceNil() bool
 }
@@ -74,7 +74,7 @@ type HyperBlocksPool interface {
 	PutShardBlock(hash []byte, outportBlock *hyperOutportBlocks.ShardOutportBlock) error
 	GetMetaBlock(hash []byte) (*hyperOutportBlocks.MetaOutportBlock, error)
 	GetShardBlock(hash []byte) (*hyperOutportBlocks.ShardOutportBlock, error)
-	UpdateMetaState(checkpoint *data.BlockCheckpoint)
+	UpdateMetaState(checkpoint *data.BlockCheckpoint) error
 	Close() error
 	IsInterfaceNil() bool
 }