Add err handling for benchmark

beacon-chain/BUILD.bazel

@@ -28,7 +28,6 @@ go_library(
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
         "@com_github_urfave_cli_v2//altsrc:go_default_library",
-        "@com_github_wercker_journalhook//:go_default_library",
         "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library",
     ],
 )
@@ -58,16 +57,15 @@ go_image(
         "//shared/debug:go_default_library",
         "//shared/featureconfig:go_default_library",
         "//shared/logutil:go_default_library",
-        "//shared/maxprocs:go_default_library",
         "//shared/version:go_default_library",
         "@com_github_ethereum_go_ethereum//log:go_default_library",
         "@com_github_ipfs_go_log_v2//:go_default_library",
         "@com_github_joonix_log//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@com_github_urfave_cli_v2//:go_default_library",
         "@com_github_urfave_cli_v2//altsrc:go_default_library",
-        "@com_github_wercker_journalhook//:go_default_library",
         "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library",
+        "//shared/maxprocs:go_default_library",
     ],
 )
 

beacon-chain/blockchain/process_block.go

@@ -246,7 +246,7 @@ func (s *Service) onBlockBatch(ctx context.Context, blks []*ethpb.SignedBeaconBl
 		if helpers.IsEpochStart(preState.Slot()) {
 			boundaries[blockRoots[i]] = preState.Copy()
 			if err := s.handleEpochBoundary(preState); err != nil {
-				return nil, nil, fmt.Errorf("could not handle epoch boundary state")
+				return nil, nil, errors.Wrap(err, "could not handle epoch boundary state")
 			}
 		}
 		jCheckpoints[i] = preState.CurrentJustifiedCheckpoint()

beacon-chain/cache/BUILD.bazel

@@ -2,6 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 # gazelle:ignore committee_disabled.go
+# gazelle:ignore proposer_indices_disabled.go
 go_library(
     name = "go_default_library",
     srcs = [
@@ -14,12 +15,15 @@ go_library(
         "skip_slot_cache.go",
         "state_summary.go",
         "subnet_ids.go",
+        "proposer_indices_type.go",
     ] + select({
         "//fuzz:fuzzing_enabled": [
             "committee_disabled.go",
+            "proposer_indices_disabled.go"
         ],
         "//conditions:default": [
             "committee.go",
+            "proposer_indices.go",
         ],
     }),
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/cache",
@@ -57,6 +61,7 @@ go_test(
         "hot_state_cache_test.go",
         "skip_slot_cache_test.go",
         "subnet_ids_test.go",
+        "proposer_indices_test.go"
     ],
     embed = [":go_default_library"],
     deps = [

beacon-chain/cache/committee.go

@@ -104,35 +104,6 @@ func (c *CommitteeCache) AddCommitteeShuffledList(committees *Committees) error
 	return nil
 }
 
-// AddProposerIndicesList updates the committee shuffled list with proposer indices.
-func (c *CommitteeCache) AddProposerIndicesList(seed [32]byte, indices []uint64) error {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	obj, exists, err := c.CommitteeCache.GetByKey(key(seed))
-	if err != nil {
-		return err
-	}
-	if !exists {
-		committees := &Committees{ProposerIndices: indices}
-		if err := c.CommitteeCache.Add(committees); err != nil {
-			return err
-		}
-	} else {
-		committees, ok := obj.(*Committees)
-		if !ok {
-			return ErrNotCommittee
-		}
-		committees.ProposerIndices = indices
-		if err := c.CommitteeCache.Add(committees); err != nil {
-			return err
-		}
-	}
-
-	trim(c.CommitteeCache, maxCommitteesCacheSize)
-	return nil
-}
-
 // ActiveIndices returns the active indices of a given seed stored in cache.
 func (c *CommitteeCache) ActiveIndices(seed [32]byte) ([]uint64, error) {
 	c.lock.RLock()
@@ -181,30 +152,6 @@ func (c *CommitteeCache) ActiveIndicesCount(seed [32]byte) (int, error) {
 	return len(item.SortedIndices), nil
 }
 
-// ProposerIndices returns the proposer indices of a given seed.
-func (c *CommitteeCache) ProposerIndices(seed [32]byte) ([]uint64, error) {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-	obj, exists, err := c.CommitteeCache.GetByKey(key(seed))
-	if err != nil {
-		return nil, err
-	}
-
-	if exists {
-		CommitteeCacheHit.Inc()
-	} else {
-		CommitteeCacheMiss.Inc()
-		return nil, nil
-	}
-
-	item, ok := obj.(*Committees)
-	if !ok {
-		return nil, ErrNotCommittee
-	}
-
-	return item.ProposerIndices, nil
-}
-
 // HasEntry returns true if the committee cache has a value.
 func (c *CommitteeCache) HasEntry(seed string) bool {
 	_, ok, err := c.CommitteeCache.GetByKey(seed)

beacon-chain/cache/committee_test.go

@@ -87,35 +87,6 @@ func TestCommitteeCache_ActiveCount(t *testing.T) {
 	assert.Equal(t, len(item.SortedIndices), count)
 }
 
-func TestCommitteeCache_AddProposerIndicesList(t *testing.T) {
-	cache := NewCommitteesCache()
-	seed := [32]byte{'A'}
-	indices, err := cache.ProposerIndices(seed)
-	require.NoError(t, err)
-	if indices != nil {
-		t.Error("Expected committee count not to exist in empty cache")
-	}
-	require.NoError(t, cache.AddProposerIndicesList(seed, indices))
-
-	received, err := cache.ProposerIndices(seed)
-	require.NoError(t, err)
-	assert.DeepEqual(t, received, indices)
-
-	item := &Committees{Seed: [32]byte{'B'}, SortedIndices: []uint64{1, 2, 3, 4, 5, 6}}
-	require.NoError(t, cache.AddCommitteeShuffledList(item))
-
-	indices, err = cache.ProposerIndices(item.Seed)
-	require.NoError(t, err)
-	if indices != nil {
-		t.Error("Expected committee count not to exist in empty cache")
-	}
-	require.NoError(t, cache.AddProposerIndicesList(item.Seed, indices))
-
-	received, err = cache.ProposerIndices(item.Seed)
-	require.NoError(t, err)
-	assert.DeepEqual(t, received, indices)
-}
-
 func TestCommitteeCache_CanRotate(t *testing.T) {
 	cache := NewCommitteesCache()
 
@@ -150,7 +121,6 @@ func TestCommitteeCacheOutOfRange(t *testing.T) {
 		Seed:            seed,
 		ShuffledIndices: []uint64{0},
 		SortedIndices:   []uint64{},
-		ProposerIndices: []uint64{},
 	})
 	require.NoError(t, err)
 

beacon-chain/cache/committees.go

@@ -12,5 +12,4 @@ type Committees struct {
 	Seed            [32]byte
 	ShuffledIndices []uint64
 	SortedIndices   []uint64
-	ProposerIndices []uint64
 }

beacon-chain/cache/proposer_indices.go

@@ -0,0 +1,88 @@
+// +build !libfuzzer
+
+package cache
+
+import (
+	"sync"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"k8s.io/client-go/tools/cache"
+)
+
+var (
+	// maxProposerIndicesCacheSize defines the max number of proposer indices on per block root basis can cache.
+	// Due to reorgs and long finality, it's good to keep the old cache around for quickly switch over.
+	maxProposerIndicesCacheSize = uint64(8)
+
+	// ProposerIndicesCacheMiss tracks the number of proposerIndices requests that aren't present in the cache.
+	ProposerIndicesCacheMiss = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "proposer_indices_cache_miss",
+		Help: "The number of proposer indices requests that aren't present in the cache.",
+	})
+	// ProposerIndicesCacheHit tracks the number of proposerIndices requests that are in the cache.
+	ProposerIndicesCacheHit = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "proposer_indices_cache_hit",
+		Help: "The number of proposer indices requests that are present in the cache.",
+	})
+)
+
+// ProposerIndicesCache is a struct with 1 queue for looking up proposer indices by root.
+type ProposerIndicesCache struct {
+	ProposerIndicesCache *cache.FIFO
+	lock                 sync.RWMutex
+}
+
+// proposerIndicesKeyFn takes the block root as the key to retrieve proposer indices in a given epoch.
+func proposerIndicesKeyFn(obj interface{}) (string, error) {
+	info, ok := obj.(*ProposerIndices)
+	if !ok {
+		return "", ErrNotProposerIndices
+	}
+
+	return key(info.BlockRoot), nil
+}
+
+// NewProposerIndicesCache creates a new proposer indices cache for storing/accessing proposer index assignments of an epoch.
+func NewProposerIndicesCache() *ProposerIndicesCache {
+	return &ProposerIndicesCache{
+		ProposerIndicesCache: cache.NewFIFO(proposerIndicesKeyFn),
+	}
+}
+
+// AddProposerIndices adds ProposerIndices object to the cache.
+// This method also trims the least recently list if the cache size has ready the max cache size limit.
+func (c *ProposerIndicesCache) AddProposerIndices(p *ProposerIndices) error {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	if err := c.ProposerIndicesCache.AddIfNotPresent(p); err != nil {
+		return err
+	}
+	trim(c.ProposerIndicesCache, maxProposerIndicesCacheSize)
+	return nil
+}
+
+// ProposerIndices returns the proposer indices of a block root seed.
+func (c *ProposerIndicesCache) ProposerIndices(r [32]byte) ([]uint64, error) {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	obj, exists, err := c.ProposerIndicesCache.GetByKey(key(r))
+	if err != nil {
+		return nil, err
+	}
+
+	if exists {
+		ProposerIndicesCacheHit.Inc()
+	} else {
+		ProposerIndicesCacheMiss.Inc()
+		return nil, nil
+	}
+
+	item, ok := obj.(*ProposerIndices)
+	if !ok {
+		return nil, ErrNotProposerIndices
+	}
+
+	return item.ProposerIndices, nil
+}

beacon-chain/cache/proposer_indices_disabled.go

@@ -0,0 +1,24 @@
+// +build libfuzzer
+
+// This file is used in fuzzer builds to bypass proposer indices caches.
+package cache
+
+// FakeProposerIndicesCache is a struct with 1 queue for looking up proposer indices by root.
+type FakeProposerIndicesCache struct {
+}
+
+// NewProposerIndicesCache creates a new proposer indices cache for storing/accessing proposer index assignments of an epoch.
+func NewProposerIndicesCache() *FakeProposerIndicesCache {
+	return &FakeProposerIndicesCache{}
+}
+
+// AddProposerIndices adds ProposerIndices object to the cache.
+// This method also trims the least recently list if the cache size has ready the max cache size limit.
+func (c *FakeProposerIndicesCache) AddProposerIndices(p *ProposerIndices) error {
+	return nil
+}
+
+// ProposerIndices returns the proposer indices of a block root seed.
+func (c *FakeProposerIndicesCache) ProposerIndices(r [32]byte) ([]uint64, error) {
+	return nil, nil
+}

beacon-chain/cache/proposer_indices_test.go

@@ -0,0 +1,63 @@
+package cache
+
+import (
+	"strconv"
+	"testing"
+
+	"github.com/prysmaticlabs/prysm/shared/bytesutil"
+	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
+	"github.com/prysmaticlabs/prysm/shared/testutil/require"
+)
+
+func TestProposerKeyFn_OK(t *testing.T) {
+	item := &ProposerIndices{
+		BlockRoot:       [32]byte{'A'},
+		ProposerIndices: []uint64{1, 2, 3, 4, 5},
+	}
+
+	k, err := proposerIndicesKeyFn(item)
+	require.NoError(t, err)
+	assert.Equal(t, key(item.BlockRoot), k)
+}
+
+func TestProposerKeyFn_InvalidObj(t *testing.T) {
+	_, err := proposerIndicesKeyFn("bad")
+	assert.Equal(t, ErrNotProposerIndices, err)
+}
+
+func TestProposerCache_AddProposerIndicesList(t *testing.T) {
+	cache := NewProposerIndicesCache()
+	bRoot := [32]byte{'A'}
+	indices, err := cache.ProposerIndices(bRoot)
+	require.NoError(t, err)
+	if indices != nil {
+		t.Error("Expected committee count not to exist in empty cache")
+	}
+	require.NoError(t, cache.AddProposerIndices(&ProposerIndices{
+		ProposerIndices: indices,
+		BlockRoot:       bRoot,
+	}))
+
+	received, err := cache.ProposerIndices(bRoot)
+	require.NoError(t, err)
+	assert.DeepEqual(t, received, indices)
+
+	item := &ProposerIndices{BlockRoot: [32]byte{'B'}, ProposerIndices: []uint64{1, 2, 3, 4, 5, 6}}
+	require.NoError(t, cache.AddProposerIndices(item))
+
+	received, err = cache.ProposerIndices(item.BlockRoot)
+	require.NoError(t, err)
+	assert.DeepEqual(t, item.ProposerIndices, received)
+}
+
+func TestProposerCache_CanRotate(t *testing.T) {
+	cache := NewProposerIndicesCache()
+	for i := 0; i < int(maxProposerIndicesCacheSize)+1; i++ {
+		s := []byte(strconv.Itoa(i))
+		item := &ProposerIndices{BlockRoot: bytesutil.ToBytes32(s)}
+		require.NoError(t, cache.AddProposerIndices(item))
+	}
+
+	k := cache.ProposerIndicesCache.ListKeys()
+	assert.Equal(t, maxProposerIndicesCacheSize, uint64(len(k)))
+}

beacon-chain/cache/proposer_indices_type.go

@@ -0,0 +1,13 @@
+package cache
+
+import "errors"
+
+// ErrNotProposerIndices will be returned when a cache object is not a pointer to
+// a ProposerIndices struct.
+var ErrNotProposerIndices = errors.New("object is not a proposer indices struct")
+
+// ProposerIndices defines the cached struct for proposer indices.
+type ProposerIndices struct {
+	BlockRoot       [32]byte
+	ProposerIndices []uint64
+}