Fix issues with dynamic key reload for imported/derived keymanager #8585
Conversation
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
# Conflicts: # validator/keymanager/imported/enable_disable_test.go
rkapka
requested review from
farazdagi,
terencechain,
nisdas,
prestonvanloon and
rauljordan
|
I would like a review from @prestonvanloon and @rauljordan before merging this. |
# Conflicts: # validator/accounts/testutil/mock_validator.go # validator/client/BUILD.bazel # validator/client/mock_validator.go # validator/client/runner.go # validator/client/runner_test.go # validator/client/testutil/mock_validator.go # validator/client/validator.go
# Conflicts: # validator/client/BUILD.bazel # validator/client/iface/validator.go # validator/client/testutil/BUILD.bazel # validator/client/testutil/mock_validator.go
rauljordan
reviewed
Mar 11, 2021
validator/client/runner.go
Outdated
| @@ -75,7 +75,7 @@ func run(ctx context.Context, v iface.Validator) { | |||
| if err != nil { | |||
| log.Fatalf("Could not determine if beacon node synced: %v", err) | |||
| } | |||
| err = v.WaitForActivation(ctx) | |||
| err = v.WaitForActivation(ctx, nil) | |||
There was a problem hiding this comment.
This is a little weird without context, I would recommend a comment like
nil /* something something */
| sub := v.GetKeymanager().SubscribeAccountChanges(accountsChangedChan) | ||
| defer func() { | ||
| sub.Unsubscribe() | ||
| close(accountsChangedChan) |
There was a problem hiding this comment.
This defer will close the channel by the time it makes it into v.waitForActivation. Is this intended behavior?
There was a problem hiding this comment.
The function will not return until waitForActivation completes, so the channel will not get closed. This PR only adds an if statement, so it wouldn't have worked in the first place.
rauljordan
approved these changes
Mar 11, 2021
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this?
Bug fix
What does this PR do? Why is it needed?
Makes all scenarios outlined in https://docs.google.com/document/d/1fLdUi6AHQ5-wYOy6DCzW5JlLlq3VuI275-KoyEZ2Pmw/edit#heading=h.m87ybthlvflh work correctly.
High-level overview:
I added a new case in the runner, where I listen to account changes via a channel. After such changes occur, I handle key reload by logging out statuses and returning if any keys are active. If there are no active keys after the reload, I call
WaitForActivationpassing the channel as a way of reacting to reload inside the function. Note that the call toWaitForActivation, which happens before the main loop, does not need an external channel, so it manages its own whennilis passed in.I defined a
validatorStatusstruct abstraction to be able to log out statuses from bothWaitForValidationandHandleKeyReload.The PR also fixes a bug in
validator/keymanager/imported/refresh.go. Currently the event publishes old keys instead of new ones.Which issues(s) does this PR fix?
Part of #8572
Fixes #8577
Other notes for review
N/A