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 data race during rly paths list #614

Merged
merged 2 commits into from
Mar 23, 2022
Merged

Fix data race during rly paths list #614

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90be92d
Fix data race during rly paths list
mark-rushakoff Mar 23, 2022
d8f39ad
Merge branch 'main' into fix/paths-list-data-race
jackzampolin Mar 23, 2022
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: 11 additions & 6 deletions relayer/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ type PathWithStatus struct {
// the current status of the path
func (p *Path) QueryPathStatus(ctx context.Context, src, dst *Chain) *PathWithStatus {
var (
err error
eg errgroup.Group
srch, dsth int64
srcCs, dstCs *clienttypes.QueryClientStateResponse
Expand All @@ -179,46 +178,52 @@ func (p *Path) QueryPathStatus(ctx context.Context, src, dst *Chain) *PathWithSt
out = &PathWithStatus{Path: p, Status: PathStatus{false, false, false}}
)
eg.Go(func() error {
var err error
srch, err = src.ChainProvider.QueryLatestHeight(ctx)
return err
})
eg.Go(func() error {
var err error
dsth, err = dst.ChainProvider.QueryLatestHeight(ctx)
return err
})
if err = eg.Wait(); err != nil {
if err := eg.Wait(); err != nil {
return out
}
out.Status.Chains = true
if err = src.SetPath(p.Src); err != nil {
if err := src.SetPath(p.Src); err != nil {
return out
}
if err = dst.SetPath(p.Dst); err != nil {
if err := dst.SetPath(p.Dst); err != nil {
return out
}

eg.Go(func() error {
var err error
srcCs, err = src.ChainProvider.QueryClientStateResponse(srch, src.ClientID())
return err
})
eg.Go(func() error {
var err error
dstCs, err = dst.ChainProvider.QueryClientStateResponse(dsth, dst.ClientID())
return err
})
if err = eg.Wait(); err != nil || srcCs == nil || dstCs == nil {
if err := eg.Wait(); err != nil || srcCs == nil || dstCs == nil {
return out
}
out.Status.Clients = true

eg.Go(func() error {
var err error
srcConn, err = src.ChainProvider.QueryConnection(srch, src.ConnectionID())
return err
})
eg.Go(func() error {
var err error
dstConn, err = dst.ChainProvider.QueryConnection(dsth, dst.ConnectionID())
return err
})
if err = eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN ||
if err := eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN ||
dstConn.Connection.State != conntypes.OPEN {
return out
}
Expand Down