fix: parallelize ensuring active pools on startup #1525
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,7 @@ import ( | |
| "github.com/hyperledger/firefly/pkg/blockchain" | ||
| "github.com/hyperledger/firefly/pkg/core" | ||
| "github.com/hyperledger/firefly/pkg/tokens" | ||
| "golang.org/x/sync/errgroup" | ||
| ) | ||
|
|
||
| type ConflictError struct { | ||
|
|
@@ -716,16 +717,31 @@ func (ft *FFTokens) handleNamespaceStarted(ctx context.Context, data fftypes.JSO | |
| // Make sure any pools that are marked as active in our DB are indeed active | ||
| namespace := data.GetString("namespace") | ||
| log.L(ctx).Debugf("Token connector '%s' started namespace '%s'. Ensuring all token pools active.", ft.Name(), namespace) | ||
|
|
||
| g, ctx := errgroup.WithContext(ctx) | ||
|
|
||
| for _, pool := range ft.poolsToActivate[namespace] { | ||
| currentPool := pool | ||
| g.Go(func() error { | ||
| _, err := ft.EnsureTokenPoolActive(ctx, currentPool) | ||
| if err == nil { | ||
| log.L(ctx).Debugf("Ensured token pool active '%s'", currentPool.ID) | ||
| } else { | ||
| log.L(ctx).Errorf("Error ensuring token pool active '%s': %s", currentPool.ID, err.Error()) | ||
| } | ||
|
|
||
| return err | ||
| }) | ||
| } | ||
|
|
||
| // g.Wait waits for all goroutines activating token pools to complete | ||
| // and returns the first non-nil error returned | ||
| // by one of the goroutines. | ||
| if err := g.Wait(); err != nil { | ||
| // The above handleMessage will retry if errors occur | ||
| return err | ||
|
There was a problem hiding this comment. This is a change in behavior - the previous It might be a positive change in behavior, but it would need some analysis/thinking (probably from @awrichar?) as to why the previous code intentionally did not fail on this condition before. There was a problem hiding this comment. Yeah I thought about that, it felt weird to me that it didn't fail on startup... Would love to hear @awrichar thoughts on this one |
||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel like using `SetLimit() on the concurrency would be better than a completely unbounded parallelism against the token connector:
https://pkg.go.dev/golang.org/x/sync/errgroup#Group.SetLimit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea - will set that to the number of pools to activate