NumPendingHeadersTotal that excludes in flight ranges

Author: julienrbrt

block/internal/cache/manager.go

@@ -82,6 +82,8 @@ type PendingManager interface {
 	ResetInFlightDataRange(start, end uint64)
 	NumPendingHeaders() uint64
 	NumPendingData() uint64
+	NumPendingHeadersTotal() uint64
+	NumPendingDataTotal() uint64
 }
 
 // Manager combines CacheManager and PendingManager.
@@ -340,6 +342,14 @@ func (m *implementation) NumPendingData() uint64 {
 	return m.pendingData.NumPendingData()
 }
 
+func (m *implementation) NumPendingHeadersTotal() uint64 {
+	return m.pendingHeaders.NumPendingHeadersTotal()
+}
+
+func (m *implementation) NumPendingDataTotal() uint64 {
+	return m.pendingData.NumPendingDataTotal()
+}
+
 // SetPendingEvent sets the event at the specified height.
 func (m *implementation) SetPendingEvent(height uint64, event *common.DAHeightEvent) {
 	m.pendingMu.Lock()

block/internal/cache/pending_base.go

@@ -145,6 +145,22 @@ func (pb *pendingBase[T]) numPending() uint64 {
 	return count
 }
 
+func (pb *pendingBase[T]) numPendingTotal() uint64 {
+	height, err := pb.store.Height(context.Background())
+	if err != nil {
+		pb.logger.Error().Err(err).Msg("failed to get height in numPendingTotal")
+		return 0
+	}
+
+	lastSubmitted := pb.lastHeight.Load()
+
+	if height <= lastSubmitted {
+		return 0
+	}
+
+	return height - lastSubmitted
+}
+
 func (pb *pendingBase[T]) getLastSubmittedHeight() uint64 {
 	return pb.lastHeight.Load()
 }

block/internal/cache/pending_data.go

@@ -81,6 +81,11 @@ func (pd *PendingData) NumPendingData() uint64 {
 	return pd.base.numPending()
 }
 
+func (pd *PendingData) NumPendingDataTotal() uint64 {
+	pd.advancePastEmptyData(context.Background())
+	return pd.base.numPendingTotal()
+}
+
 func (pd *PendingData) SetLastSubmittedDataHeight(ctx context.Context, newLastSubmittedDataHeight uint64) {
 	pd.base.setLastSubmittedHeight(ctx, newLastSubmittedDataHeight)
 }

block/internal/cache/pending_headers.go

@@ -76,6 +76,10 @@ func (ph *PendingHeaders) NumPendingHeaders() uint64 {
 	return ph.base.numPending()
 }
 
+func (ph *PendingHeaders) NumPendingHeadersTotal() uint64 {
+	return ph.base.numPendingTotal()
+}
+
 func (ph *PendingHeaders) SetLastSubmittedHeaderHeight(ctx context.Context, newLastSubmittedHeaderHeight uint64) {
 	ph.base.setLastSubmittedHeight(ctx, newLastSubmittedHeaderHeight)
 }

block/internal/executing/executor.go

@@ -484,8 +484,8 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 		shouldCheck := e.config.Node.MaxPendingHeadersAndData <= pendingCheckInterval ||
 			e.pendingCheckCounter%pendingCheckInterval == 0
 		if shouldCheck {
-			pendingHeaders := e.cache.NumPendingHeaders()
-			pendingData := e.cache.NumPendingData()
+			pendingHeaders := e.cache.NumPendingHeadersTotal()
+			pendingData := e.cache.NumPendingDataTotal()
 			if pendingHeaders >= e.config.Node.MaxPendingHeadersAndData ||
 				pendingData >= e.config.Node.MaxPendingHeadersAndData {
 				e.logger.Warn().