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

Retry shuttermint requests #329

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Retry shuttermint requests #329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 13 additions & 4 deletions rolling-shutter/keyper/smdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprdb"
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/shutterevents"
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
)

type ShuttermintDriver struct {
Expand All @@ -26,7 +27,9 @@ type ShuttermintDriver struct {
var errEmptyBlockchain = errors.New("empty shuttermint blockchain")

func getLastCommittedHeight(ctx context.Context, shmcl client.Client) (int64, error) {
latestBlock, err := shmcl.Block(ctx, nil)
latestBlock, err := medley.Retry(ctx, func() (*coretypes.ResultBlock, error) {
return shmcl.Block(ctx, nil)
})
if err != nil {
return 0, errors.Wrap(err, "failed to get last committed height of shuttermint chain")
}
Expand Down Expand Up @@ -91,7 +94,9 @@ func makeEvents(height int64, events []abcitypes.Event) []shutterevents.IEvent {

func (smdrv *ShuttermintDriver) fetchEvents2(ctx context.Context, heightFrom, lastCommittedHeight int64) error {
for currentBlock := heightFrom + 1; currentBlock < lastCommittedHeight; currentBlock++ {
results, err := smdrv.shmcl.BlockResults(ctx, &currentBlock)
results, err := medley.Retry(ctx, func() (*coretypes.ResultBlockResults, error) {
return smdrv.shmcl.BlockResults(ctx, &currentBlock)
})
if err != nil {
return err
}
Expand Down Expand Up @@ -128,7 +133,9 @@ func (smdrv *ShuttermintDriver) fetchEvents(ctx context.Context, heightFrom, las
total := 0
txs := []*coretypes.ResultTx{}
for {
res, err := smdrv.shmcl.TxSearch(ctx, query, false, &page, &perPage, "")
res, err := medley.Retry(ctx, func() (*coretypes.ResultTxSearch, error) {
return smdrv.shmcl.TxSearch(ctx, query, false, &page, &perPage, "")
})
if err != nil {
return errors.Wrap(err, "failed to fetch shuttermint txs")
}
Expand All @@ -147,7 +154,9 @@ func (smdrv *ShuttermintDriver) fetchEvents(ctx context.Context, heightFrom, las
}
page++
}
err := smdrv.handleTransactions(ctx, txs, currentBlock, height, lastCommittedHeight)
_, err := medley.Retry(ctx, func() (struct{}, error) {
return struct{}{}, smdrv.handleTransactions(ctx, txs, currentBlock, height, lastCommittedHeight)
})
if err != nil {
return err
}
Expand Down