Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(syncer): set timeout for head request #152

Merged
merged 4 commits into from
Feb 1, 2024
Merged

fix(syncer): set timeout for head request #152

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89c2b8f
fix(syncer): set timeout for head request
vgonkivs Jan 30, 2024
e4e05bd
Update sync/sync_head.go
vgonkivs Jan 30, 2024
3126f41
some docs updates
Wondertan Jan 31, 2024
2eaee6e
change todo
Wondertan Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions sync/sync_head.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import (
// Head returns the Network Head.
//
// Known subjective head is considered network head if it is recent enough(now-timestamp<=blocktime)
// Otherwise, head is requested from a trusted peer and
// Otherwise, we attempt to request recent network head from a trusted peer and
// set as the new subjective head, assuming that trusted peer is always fully synced.
//
// The request is limited with 2 seconds and otherwise potentially unrecent header is returned.
func (s *Syncer[H]) Head(ctx context.Context, _ ...header.HeadOption[H]) (H, error) {
sbjHead, err := s.subjectiveHead(ctx)
if err != nil {
Expand All @@ -38,7 +40,11 @@ func (s *Syncer[H]) Head(ctx context.Context, _ ...header.HeadOption[H]) (H, err
return s.Head(ctx)
}
defer s.getter.Unlock()
netHead, err := s.getter.Head(ctx, header.WithTrustedHead[H](sbjHead))
// limit time to get a recent header
// if we can't get it - give what we have
reqCtx, cancel := context.WithTimeout(ctx, time.Second*2) // TODO(@vgonkivs): make timeout configurable
defer cancel()
walldiss marked this conversation as resolved.
Show resolved Hide resolved
netHead, err := s.getter.Head(reqCtx, header.WithTrustedHead[H](sbjHead))
Wondertan marked this conversation as resolved.
Show resolved Hide resolved
Wondertan marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
log.Warnw("failed to get recent head, returning current subjective", "sbjHead", sbjHead.Height(), "err", err)
return s.subjectiveHead(ctx)
Expand Down
Loading