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

Jump to bottom

algod importer: Update sync on WaitForBlock error. #122

Merged
merged 11 commits into from
Jul 21, 2023
Merged

algod importer: Update sync on WaitForBlock error. #122

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4284e64
Bugfix
winder Jul 20, 2023
7598a48
WIP
winder Jul 20, 2023
44b7735
Fix tests.
winder Jul 20, 2023
77e247f
Update test name.
winder Jul 20, 2023
3cbacad
Linter fix
winder Jul 20, 2023
610a7b9
Add helpful comment to test.
winder Jul 20, 2023
67a58eb
Be slightly more aggressive with the SyncError.
winder Jul 20, 2023
2f5dd92
Fix tests, add another test.
winder Jul 20, 2023
72c5dd4
Fix the other test...
winder Jul 20, 2023
fc9a9b5
PR feedback.
winder Jul 21, 2023
042ec0b
Help distinguishing unknown errors.
winder Jul 21, 2023
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
17 changes: 10 additions & 7 deletions conduit/plugins/importers/algod/algod_importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,10 @@ func waitForRoundWithTimeout(ctx context.Context, l *logrus.Logger, c *algod.Cli
l.Tracef("importer algod.waitForRoundWithTimeout() called StatusAfterBlock(%d) err: %v", rnd-1, err)

if err == nil {
// On a timeout StatusAfterBlock returns the current status, so check that we've actually reached the correct round.
if status.LastRound >= rnd {
// When c.StatusAfterBlock has a server-side timeout it returns the current status.
// We use a context with timeout and the algod default timeout is 1 minute, so technically
// with the current versions, this check should never be required.
if rnd <= status.LastRound {
return status.LastRound, nil
}
return 0, &SyncError{
Expand All @@ -446,9 +448,10 @@ func waitForRoundWithTimeout(ctx context.Context, l *logrus.Logger, c *algod.Cli

// If there was a different error and the node is responsive, call status before returning a SyncError.
status2, err2 := c.Status().Do(ctx)
tzaffi marked this conversation as resolved.
Show resolved Hide resolved
l.Tracef("importer algod.waitForRoundWithTimeout() called Status() err: %v", err)
l.Tracef("importer algod.waitForRoundWithTimeout() called Status() err: %v", err2)
if err2 != nil {
return 0, fmt.Errorf("unable to get status: %w", err)
// If there was an error getting status, return the original error.
return 0, fmt.Errorf("unable to get status after block and status: %w", errors.Join(err, err2))
}
if status2.LastRound < rnd {
return 0, &SyncError{
Expand All @@ -458,10 +461,10 @@ func waitForRoundWithTimeout(ctx context.Context, l *logrus.Logger, c *algod.Cli
}

// This is probably a connection error, not a SyncError.
return 0, err
return 0, fmt.Errorf("unknown error: %w", errors.Join(err, err2))
tzaffi marked this conversation as resolved.
Show resolved Hide resolved
}

func (algodImp *algodImporter) GetBlockInner(rnd uint64) (data.BlockData, error) {
func (algodImp *algodImporter) getBlockInner(rnd uint64) (data.BlockData, error) {
var blockbytes []byte
var blk data.BlockData

Expand Down Expand Up @@ -515,7 +518,7 @@ func (algodImp *algodImporter) GetBlockInner(rnd uint64) (data.BlockData, error)
}

func (algodImp *algodImporter) GetBlock(rnd uint64) (data.BlockData, error) {
blk, err := algodImp.GetBlockInner(rnd)
blk, err := algodImp.getBlockInner(rnd)

if err != nil {
target := &SyncError{}
Expand Down