add '*' default value for --access-node-ids flag for LN/SN nodes #1426
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
kc1116
requested review from
huitseeker,
zhangchiqing,
vishalchangrani and
jordanschalm
|
Follow up to this ticket https://github.com/dapperlabs/flow-internal/issues/1594 |
Codecov Report
@@ Coverage Diff @@
## master #1426 +/- ##
==========================================
- Coverage 55.41% 55.39% -0.02%
==========================================
Files 512 512
Lines 31942 31964 +22
==========================================
+ Hits 17700 17707 +7
- Misses 11862 11873 +11
- Partials 2380 2384 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
jordanschalm
reviewed
Oct 4, 2021
| @@ -384,7 +365,7 @@ func prepareConsensusService(container testnet.ContainerConfig, i int, accessNod | |||
| fmt.Sprintf("--chunk-alpha=1"), | |||
| fmt.Sprintf("--emergency-sealing-active=false"), | |||
| fmt.Sprintf("--insecure-access-api=false"), | |||
| fmt.Sprintf("--access-node-ids=%s", accessNodeIDS), | |||
| fmt.Sprint("--access-node-ids=*"), | |||
cmd/collection/main.go
Outdated
Comment on lines
209
to
213
| if accessNodeIDS[0] == "*" { | ||
| anIDS, err = common.DefaultAccessNodeIDS(node.State.Sealed()) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get default access node ids %w", err) | ||
| } |
There was a problem hiding this comment.
I think we should explicitly disallow this configuration on Mainnet for now.
Suggested change
| if accessNodeIDS[0] == "*" { | |
| anIDS, err = common.DefaultAccessNodeIDS(node.State.Sealed()) | |
| if err != nil { | |
| return fmt.Errorf("failed to get default access node ids %w", err) | |
| } | |
| if accessNodeIDS[0] == "*" { | |
| if node.ChainID == flow.Mainnet { | |
| return fmt.Errorf("must specify preferred access node IDs for non-test networks") | |
| } | |
| anIDS, err = common.DefaultAccessNodeIDS(node.State.Sealed()) | |
| if err != nil { | |
| return fmt.Errorf("failed to get default access node ids %w", err) | |
| } |
cmd/consensus/main.go
Outdated
|
|
||
| // if * provided use all ids in protocol state by default | ||
| if accessNodeIDS[0] == "*" { | ||
| anIDS, err = common.DefaultAccessNodeIDS(node.State.Sealed()) |
There was a problem hiding this comment.
same here - disallow this configuration on mainnet
…ow/flow-go into khalil/1583-stake-node-util-func
huitseeker
reviewed
Oct 5, 2021
cmd/collection/main.go
Outdated
| @@ -146,7 +146,7 @@ func main() { | |||
|
|
|||
| // epoch qc contract flags | |||
| flags.BoolVar(&insecureAccessAPI, "insecure-access-api", false, "required if insecure GRPC connection should be used") | |||
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. minimum length %d", common.DefaultAccessNodeIDSMinimum)) | |||
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) | |||
There was a problem hiding this comment.
Suggested change
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) | |
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node IDs sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) |
cmd/consensus/main.go
Outdated
| @@ -145,7 +145,7 @@ func main() { | |||
| flags.UintVar(&requiredApprovalsForSealConstruction, "required-construction-seal-approvals", sealing.DefaultRequiredApprovalsForSealConstruction, "minimum number of approvals that are required to construct a seal") | |||
| flags.BoolVar(&emergencySealing, "emergency-sealing-active", sealing.DefaultEmergencySealingActive, "(de)activation of emergency sealing") | |||
| flags.BoolVar(&insecureAccessAPI, "insecure-access-api", false, "required if insecure GRPC connection should be used") | |||
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. minimum length %d", common.DefaultAccessNodeIDSMinimum)) | |||
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) | |||
There was a problem hiding this comment.
Suggested change
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node ID's sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID after serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) | |
| flags.StringSliceVar(&accessNodeIDS, "access-node-ids", []string{}, fmt.Sprintf("array of access node IDs sorted in priority order where the first ID in this array will get the first connection attempt and each subsequent ID serves as a fallback. Minimum length %d. Use '*' for all IDs in protocol state.", common.DefaultAccessNodeIDSMinimum)) |
| accessNodeIDS := make([]string, 0) | ||
| for i, c := range containers { | ||
| fmt.Printf("%d: %s", i+1, c.Identity().String()) | ||
| if c.Unstaked { |
There was a problem hiding this comment.
If you're removing this, you might as well remove the boolean flag Unstaked in integration/testnet/container.go. It's obsolete anyway. /cc @vishalchangrani for double-check.
| @@ -139,3 +128,29 @@ func convertAccessAddrFromState(address string, insecureAccessAPI bool) string { | |||
|
|
|||
| return accessAddress.String() | |||
| } | |||
|
|
|||
| // DefaultAccessNodeIDS will return all the access node IDS in the protocol state for staked access nodes | |||
| func DefaultAccessNodeIDS(snapshot protocol.Snapshot) ([]flow.Identifier, error) { | |||
There was a problem hiding this comment.
- This should probably never be allowed to return 0 IDs.
- This can return < 2 IDs. Depending on whether we're in a test situation, and. whether the test is specifically exercising AN fallback mechanisms, this may or may not be a bad thing. But I would at the very least log a warning there.
…obsolete struct field ContainerConfig.Unstaked
Co-authored-by: Jordan Schalm <jordan@dapperlabs.com>
|
bors merge |
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.
This PR adds support for '*' value that can be set for the --acess-node-ids flag on LN & SN nodes. When this value is set LN/SN nodes will use ids of all the access nodes in the protocol state.
i.e :
--access-node-ids=*