AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 13:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add tracing and annotation for descendent error (#3859)

Browse Source 
* Add annotation

* Revert
This commit is contained in:
terence tsao
2019-10-26 20:26:51 -07:00
committed by Preston Van Loon
parent c5b0b3c326
commit 582c382771
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon-chain/blockchain/forkchoice/BUILD.bazel
View File

@@ -25,6 +25,7 @@ go_library(
"//shared/featureconfig:go_default_library", "//shared/featureconfig:go_default_library",
"//shared/hashutil:go_default_library", "//shared/hashutil:go_default_library",
"//shared/params:go_default_library", "//shared/params:go_default_library",
"//shared/traceutil:go_default_library",
"@com_github_gogo_protobuf//proto:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library",
"@com_github_pkg_errors//:go_default_library", "@com_github_pkg_errors//:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library",

12
beacon-chain/blockchain/forkchoice/process_block.go
View File

@@ -18,6 +18,7 @@ import (
"github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/hashutil"
"github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/traceutil"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.opencensus.io/trace" "go.opencensus.io/trace"
) )
@@ -223,6 +224,9 @@ func (s *Store) OnBlockNoVerifyStateTransition(ctx context.Context, b *ethpb.Bea
// to retrieve the state in DB. It verifies the pre state's validity and the incoming block // to retrieve the state in DB. It verifies the pre state's validity and the incoming block
// is in the correct time window. // is in the correct time window.
func (s *Store) getBlockPreState(ctx context.Context, b *ethpb.BeaconBlock) (*pb.BeaconState, error) { func (s *Store) getBlockPreState(ctx context.Context, b *ethpb.BeaconBlock) (*pb.BeaconState, error) {
ctx, span := trace.StartSpan(ctx, "forkchoice.getBlockPreState")
defer span.End()
// Verify incoming block has a valid pre state. // Verify incoming block has a valid pre state.
preState, err := s.verifyBlkPreState(ctx, b) preState, err := s.verifyBlkPreState(ctx, b)
if err != nil { if err != nil {
@@ -313,6 +317,9 @@ func (s *Store) verifyBlkPreState(ctx context.Context, b *ethpb.BeaconBlock) (*p
// verifyBlkDescendant validates input block root is a descendant of the // verifyBlkDescendant validates input block root is a descendant of the
// current finalized block root. // current finalized block root.
func (s *Store) verifyBlkDescendant(ctx context.Context, root [32]byte, slot uint64) error { func (s *Store) verifyBlkDescendant(ctx context.Context, root [32]byte, slot uint64) error {
ctx, span := trace.StartSpan(ctx, "forkchoice.verifyBlkDescendant")
defer span.End()
finalizedBlk, err := s.db.Block(ctx, bytesutil.ToBytes32(s.finalizedCheckpt.Root)) finalizedBlk, err := s.db.Block(ctx, bytesutil.ToBytes32(s.finalizedCheckpt.Root))
if err != nil || finalizedBlk == nil { if err != nil || finalizedBlk == nil {
return errors.Wrap(err, "could not get finalized block") return errors.Wrap(err, "could not get finalized block")
@@ -323,7 +330,10 @@ func (s *Store) verifyBlkDescendant(ctx context.Context, root [32]byte, slot uin
return errors.Wrap(err, "could not get finalized block root") return errors.Wrap(err, "could not get finalized block root")
} }
if !bytes.Equal(bFinalizedRoot, s.finalizedCheckpt.Root) { if !bytes.Equal(bFinalizedRoot, s.finalizedCheckpt.Root) {
return fmt.Errorf("block from slot %d is not a descendent of the current finalized block", slot) err := fmt.Errorf("block from slot %d is not a descendent of the current finalized block slot %d, %#x != %#x",
slot, finalizedBlk.Slot, bytesutil.Trunc(bFinalizedRoot), bytesutil.Trunc(s.finalizedCheckpt.Root))
traceutil.AnnotateError(span, err)
return err
} }
return nil return nil
} }