mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 15:37:56 -05:00
#### This PR sets the foundation for the new logging features. --- The goal of this big PR is the following: 1. Adding a log.go file to every package: [_commit_](54f6396d4c) - Writing a bash script that adds the log.go file to every package that imports logrus, except the excluded packages, configured at the top of the bash script. - the log.go file creates a log variable and sets a field called `package` to the full path of that package. - I have tried to fix every error/problem that came from mass generation of this file. (duplicate declarations, different prefix names, etc...) - some packages had the log.go file from before, and had some helper functions in there as well. I've moved all of them to a `log_helpers.go` file within each package. 2. Create a CI rule which verifies that: [_commit_](b799c3a0ef) - every package which imports logrus, also has a log.go file, except the excluded packages. - the `package` field of each log.go variable, has the correct path. (to detect when we move a package or change it's name) - I pushed a commit with a manually changed log.go file to trigger the ci check failure and it worked. 3. Alter the logging system to read the prefix from this `package` field for every log while outputing: [_commit_](b0c7f1146c) - some packages have/want/need a different log prefix than their package name (like `kv`). This can be solved by keeping a map of package paths to prefix names somewhere. --- **Some notes:** - Please review everything carefully. - I created the `prefixReplacement` map and populated the data that I deemed necessary. Please check it and complain if something doesn't make sense or is missing. I attached at the bottom, the list of all the packages that used to use a different name than their package name as their prefix. - I have chosen to mark some packages to be excluded from this whole process. They will either not log anything, or log without a prefix, or log using their previously defined prefix. See the list of exclusions in the bottom. - I fixed all the tests that failed because of this change. These were failing because they were expecting the old prefix to be in the generated logs. I have changed those to expect the new `package` field instead. This might not be a great solution. Ideally we might want to remove this from the tests so they only test for relevant fields in the logs. but this is a problem for another day. - Please run the node with this config, and mention if you see something weird in the logs. (use different verbosities) - The CI workflow uses a script that basically runs the `hack/gen-logs.sh` and checks that the git diff is zero. that script is `hack/check-logs.sh`. This means that if one runs this script locally, it will not actually _check_ anything, rather than just regenerate the log.go files and fix any mistake. This might be confusing. Please suggest solutions if you think it's a problem. --- **A list of packages that used a different prefix than their package names for their logs:** - beacon-chain/cache/depositsnapshot/ package depositsnapshot, prefix "cache" - beacon-chain/core/transition/log.go — package transition, prefix "state" - beacon-chain/db/kv/log.go — package kv, prefix "db" - beacon-chain/db/slasherkv/log.go — package slasherkv, prefix "slasherdb" - beacon-chain/db/pruner/pruner.go — package pruner, prefix "db-pruner" - beacon-chain/light-client/log.go — package light_client, prefix "light-client" - beacon-chain/operations/attestations/log.go — package attestations, prefix "pool/attestations" - beacon-chain/operations/slashings/log.go — package slashings, prefix "pool/slashings" - beacon-chain/rpc/core/log.go — package core, prefix "rpc/core" - beacon-chain/rpc/eth/beacon/log.go — package beacon, prefix "rpc/beaconv1" - beacon-chain/rpc/eth/validator/log.go — package validator, prefix "beacon-api" - beacon-chain/rpc/prysm/v1alpha1/beacon/log.go — package beacon, prefix "rpc" - beacon-chain/rpc/prysm/v1alpha1/validator/log.go — package validator, prefix "rpc/validator" - beacon-chain/state/stategen/log.go — package stategen, prefix "state-gen" - beacon-chain/sync/checkpoint/log.go — package checkpoint, prefix "checkpoint-sync" - beacon-chain/sync/initial-sync/log.go — package initialsync, prefix "initial-sync" - cmd/prysmctl/p2p/log.go — package p2p, prefix "prysmctl-p2p" - config/features/log.go -- package features, prefix "flags" - io/file/log.go — package file, prefix "fileutil" - proto/prysm/v1alpha1/log.go — package eth, prefix "protobuf" - validator/client/beacon-api/log.go — package beacon_api, prefix "beacon-api" - validator/db/kv/log.go — package kv, prefix "db" - validator/db/filesystem/db.go — package filesystem, prefix "db" - validator/keymanager/derived/log.go — package derived, prefix "derived-keymanager" - validator/keymanager/local/log.go — package local, prefix "local-keymanager" - validator/keymanager/remote-web3signer/log.go — package remote_web3signer, prefix "remote-keymanager" - validator/keymanager/remote-web3signer/internal/log.go — package internal, prefix "remote-web3signer- internal" - beacon-chain/forkchoice/doubly... prefix is "forkchoice-doublylinkedtree" **List of excluded directories (their subdirectories are also excluded):** ``` EXCLUDED_PATH_PREFIXES=( "testing" "validator/client/testutil" "beacon-chain/p2p/testing" "beacon-chain/rpc/eth/config" "beacon-chain/rpc/prysm/v1alpha1/debug" "tools" "runtime" "monitoring" "io" "cmd" ".well-known" "changelog" "hack" "specrefs" "third_party" "bazel-out" "bazel-bin" "bazel-prysm" "bazel-testlogs" "build" ".github" ".jj" ".idea" ".vscode" ) ```
246 lines
8.8 KiB
Go
246 lines
8.8 KiB
Go
//go:build !fuzz
|
|
|
|
package cache
|
|
|
|
import (
|
|
"sync"
|
|
"sync/atomic"
|
|
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/state"
|
|
"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
|
|
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/client_golang/prometheus/promauto"
|
|
"k8s.io/client-go/tools/cache"
|
|
)
|
|
|
|
var (
|
|
maxSyncCommitteeSize = uint64(3) // Allows 3 forks to happen around `EPOCHS_PER_SYNC_COMMITTEE_PERIOD` boundary.
|
|
|
|
// SyncCommitteeCacheMiss tracks the number of committee requests that aren't present in the cache.
|
|
SyncCommitteeCacheMiss = promauto.NewCounter(prometheus.CounterOpts{
|
|
Name: "sync_committee_index_cache_miss_total",
|
|
Help: "The number of committee requests that aren't present in the sync committee index cache.",
|
|
})
|
|
// SyncCommitteeCacheHit tracks the number of committee requests that are in the cache.
|
|
SyncCommitteeCacheHit = promauto.NewCounter(prometheus.CounterOpts{
|
|
Name: "sync_committee_index_cache_hit_total",
|
|
Help: "The number of committee requests that are present in the sync committee index cache.",
|
|
})
|
|
)
|
|
|
|
// SyncCommitteeCache utilizes a FIFO cache to sufficiently cache validator position within sync committee.
|
|
// It is thread safe with concurrent read write.
|
|
type SyncCommitteeCache struct {
|
|
cache *cache.FIFO
|
|
lock sync.RWMutex
|
|
cleared *atomic.Uint64
|
|
}
|
|
|
|
// Index position of all validators in sync committee where `currentSyncCommitteeRoot` is the
|
|
// key and `vIndexToPositionMap` is value. Inside `vIndexToPositionMap`, validator positions
|
|
// are cached where key is the validator index and the value is the `positionInCommittee` struct.
|
|
type syncCommitteeIndexPosition struct {
|
|
currentSyncCommitteeRoot [32]byte
|
|
vIndexToPositionMap map[primitives.ValidatorIndex]*positionInCommittee
|
|
}
|
|
|
|
// Index position of individual validator of current period and next period sync committee.
|
|
type positionInCommittee struct {
|
|
currentPeriod []primitives.CommitteeIndex
|
|
nextPeriod []primitives.CommitteeIndex
|
|
}
|
|
|
|
// NewSyncCommittee initializes and returns a new SyncCommitteeCache.
|
|
func NewSyncCommittee() *SyncCommitteeCache {
|
|
c := &SyncCommitteeCache{cleared: &atomic.Uint64{}}
|
|
c.Clear()
|
|
return c
|
|
}
|
|
|
|
// Clear resets the SyncCommitteeCache to its initial state
|
|
func (s *SyncCommitteeCache) Clear() {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
s.cleared.Add(1)
|
|
s.cache = cache.NewFIFO(keyFn)
|
|
}
|
|
|
|
// CurrentPeriodPositions returns current period positions of validator indices with respect with
|
|
// sync committee. If any input validator index has no assignment, an empty list will be returned
|
|
// for that validator. If the input root does not exist in cache, `ErrNonExistingSyncCommitteeKey` is returned.
|
|
// Manual checking of state for index position in state is recommended when `ErrNonExistingSyncCommitteeKey` is returned.
|
|
func (s *SyncCommitteeCache) CurrentPeriodPositions(root [32]byte, indices []primitives.ValidatorIndex) ([][]primitives.CommitteeIndex, error) {
|
|
s.lock.RLock()
|
|
defer s.lock.RUnlock()
|
|
|
|
pos, err := s.positionsInCommittee(root, indices)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
result := make([][]primitives.CommitteeIndex, len(pos))
|
|
for i, p := range pos {
|
|
if p == nil {
|
|
result[i] = []primitives.CommitteeIndex{}
|
|
} else {
|
|
result[i] = p.currentPeriod
|
|
}
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
// CurrentPeriodIndexPosition returns current period index position of a validator index with respect with
|
|
// sync committee. If the input validator index has no assignment, an empty list will be returned.
|
|
// If the input root does not exist in cache, `ErrNonExistingSyncCommitteeKey` is returned.
|
|
// Manual checking of state for index position in state is recommended when `ErrNonExistingSyncCommitteeKey` is returned.
|
|
func (s *SyncCommitteeCache) CurrentPeriodIndexPosition(root [32]byte, valIdx primitives.ValidatorIndex) ([]primitives.CommitteeIndex, error) {
|
|
s.lock.RLock()
|
|
defer s.lock.RUnlock()
|
|
|
|
pos, err := s.idxPositionInCommittee(root, valIdx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if pos == nil {
|
|
return []primitives.CommitteeIndex{}, nil
|
|
}
|
|
|
|
return pos.currentPeriod, nil
|
|
}
|
|
|
|
// NextPeriodIndexPosition returns next period index position of a validator index in respect with sync committee.
|
|
// If the input validator index has no assignment, an empty list will be returned.
|
|
// If the input root does not exist in cache, `ErrNonExistingSyncCommitteeKey` is returned.
|
|
// Manual checking of state for index position in state is recommended when `ErrNonExistingSyncCommitteeKey` is returned.
|
|
func (s *SyncCommitteeCache) NextPeriodIndexPosition(root [32]byte, valIdx primitives.ValidatorIndex) ([]primitives.CommitteeIndex, error) {
|
|
s.lock.RLock()
|
|
defer s.lock.RUnlock()
|
|
|
|
pos, err := s.idxPositionInCommittee(root, valIdx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if pos == nil {
|
|
return []primitives.CommitteeIndex{}, nil
|
|
}
|
|
return pos.nextPeriod, nil
|
|
}
|
|
|
|
func (s *SyncCommitteeCache) positionsInCommittee(root [32]byte, indices []primitives.ValidatorIndex) ([]*positionInCommittee, error) {
|
|
obj, exists, err := s.cache.GetByKey(key(root))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !exists {
|
|
SyncCommitteeCacheMiss.Inc()
|
|
return nil, ErrNonExistingSyncCommitteeKey
|
|
}
|
|
item, ok := obj.(*syncCommitteeIndexPosition)
|
|
if !ok {
|
|
return nil, errNotSyncCommitteeIndexPosition
|
|
}
|
|
result := make([]*positionInCommittee, len(indices))
|
|
for i, idx := range indices {
|
|
idxInCommittee, ok := item.vIndexToPositionMap[idx]
|
|
if ok {
|
|
SyncCommitteeCacheHit.Inc()
|
|
result[i] = idxInCommittee
|
|
} else {
|
|
SyncCommitteeCacheMiss.Inc()
|
|
result[i] = nil
|
|
}
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
// Helper function for `CurrentPeriodIndexPosition` and `NextPeriodIndexPosition` to return a mapping
|
|
// of validator index to its index(s) position in the sync committee.
|
|
func (s *SyncCommitteeCache) idxPositionInCommittee(
|
|
root [32]byte, valIdx primitives.ValidatorIndex,
|
|
) (*positionInCommittee, error) {
|
|
positions, err := s.positionsInCommittee(root, []primitives.ValidatorIndex{valIdx})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(positions) == 0 {
|
|
return nil, nil
|
|
}
|
|
return positions[0], nil
|
|
}
|
|
|
|
// UpdatePositionsInCommittee updates caching of validators position in sync committee in respect to
|
|
// current epoch and next epoch. This should be called when `current_sync_committee` and `next_sync_committee`
|
|
// change and that happens every `EPOCHS_PER_SYNC_COMMITTEE_PERIOD`.
|
|
func (s *SyncCommitteeCache) UpdatePositionsInCommittee(syncCommitteeBoundaryRoot [32]byte, st state.BeaconState) error {
|
|
// since we call UpdatePositionsInCommittee asynchronously, keep track of the cache value
|
|
// seen at the beginning of the routine and compare at the end before updating. If the underlying value has been
|
|
// cycled (new address), don't update it.
|
|
clearCount := s.cleared.Load()
|
|
csc, err := st.CurrentSyncCommittee()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
positionsMap := make(map[primitives.ValidatorIndex]*positionInCommittee)
|
|
for i, pubkey := range csc.Pubkeys {
|
|
p := bytesutil.ToBytes48(pubkey)
|
|
validatorIndex, ok := st.ValidatorIndexByPubkey(p)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if _, ok := positionsMap[validatorIndex]; !ok {
|
|
m := &positionInCommittee{currentPeriod: []primitives.CommitteeIndex{primitives.CommitteeIndex(i)}, nextPeriod: []primitives.CommitteeIndex{}}
|
|
positionsMap[validatorIndex] = m
|
|
} else {
|
|
positionsMap[validatorIndex].currentPeriod = append(positionsMap[validatorIndex].currentPeriod, primitives.CommitteeIndex(i))
|
|
}
|
|
}
|
|
|
|
nsc, err := st.NextSyncCommittee()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for i, pubkey := range nsc.Pubkeys {
|
|
p := bytesutil.ToBytes48(pubkey)
|
|
validatorIndex, ok := st.ValidatorIndexByPubkey(p)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if _, ok := positionsMap[validatorIndex]; !ok {
|
|
m := &positionInCommittee{nextPeriod: []primitives.CommitteeIndex{primitives.CommitteeIndex(i)}, currentPeriod: []primitives.CommitteeIndex{}}
|
|
positionsMap[validatorIndex] = m
|
|
} else {
|
|
positionsMap[validatorIndex].nextPeriod = append(positionsMap[validatorIndex].nextPeriod, primitives.CommitteeIndex(i))
|
|
}
|
|
}
|
|
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
if clearCount != s.cleared.Load() {
|
|
log.Warn("Cache rotated during async committee update operation - abandoning cache update")
|
|
return nil
|
|
}
|
|
|
|
if err := s.cache.Add(&syncCommitteeIndexPosition{
|
|
currentSyncCommitteeRoot: syncCommitteeBoundaryRoot,
|
|
vIndexToPositionMap: positionsMap,
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
trim(s.cache, maxSyncCommitteeSize)
|
|
|
|
return nil
|
|
}
|
|
|
|
// Given the `syncCommitteeIndexPosition` object, this returns the key of the object.
|
|
// The key is the `currentSyncCommitteeRoot` within the field.
|
|
// Error gets returned if input does not comply with `currentSyncCommitteeRoot` object.
|
|
func keyFn(obj any) (string, error) {
|
|
info, ok := obj.(*syncCommitteeIndexPosition)
|
|
if !ok {
|
|
return "", errNotSyncCommitteeIndexPosition
|
|
}
|
|
|
|
return string(info.currentSyncCommitteeRoot[:]), nil
|
|
}
|