adding an RuntimeSubsystems API to storage miner; fix lotus-miner info
#6906
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
nonsense
force-pushed
the
nonsense/get-enabled-subsystems-api
branch
2 times, most recently
from
a3895f7
to
3e0a339
Compare
raulk
reviewed
Jul 28, 2021
nonsense
force-pushed
the
nonsense/get-enabled-subsystems-api
branch
from
3e0a339
to
7c6eb4f
Compare
raulk
reviewed
Jul 28, 2021
Comment on lines
544
to
549
| Perms: read | ||
|
|
||
| Inputs: `null` | ||
|
|
||
| Response: `null` | ||
|
|
node/builder_miner.go
Outdated
| @@ -72,6 +72,7 @@ func ConfigStorageMiner(c interface{}) Option { | |||
| return Options( | |||
| ConfigCommon(&cfg.Common, enableLibp2pNode), | |||
|
|
|||
| Override(new(*api.MinerSubsystem), modules.AddMinerSubsystems(cfg.Subsystems)), | |||
There was a problem hiding this comment.
Let's create a dtype here: dtypes.EnabledSubsystems = api.MinerSubsystems.
raulk
reviewed
Jul 28, 2021
nonsense
force-pushed
the
nonsense/get-enabled-subsystems-api
branch
from
b902012
to
de4a847
Compare
nonsense
commented
Jul 28, 2021
magik6k
reviewed
Jul 28, 2021
nonsense
force-pushed
the
nonsense/get-enabled-subsystems-api
branch
from
72f9eb1
to
54c6a3a
Compare
|
Marking this as ready for review, as it is already in working state, and addresses the underlying issue with miners getting panics on |
nonsense
changed the title
lotus-miner info
jacobheun
added
release/backport
team/ignite
raulk
reviewed
Jul 28, 2021
raulk
force-pushed
the
nonsense/get-enabled-subsystems-api
branch
from
6b653a6
to
07f40b9
Compare
raulk
approved these changes
Jul 28, 2021
Stebalien
approved these changes
Jul 28, 2021
node/modules/storageminer.go
Outdated
| @@ -1007,3 +1007,19 @@ func mutateCfg(r repo.LockedRepo, mutator func(*config.StorageMiner)) error { | |||
|
|
|||
| return multierr.Combine(typeErr, setConfigErr) | |||
| } | |||
|
|
|||
| func PopulateEnabledMinerSubsystems(cfg config.MinerSubsystemConfig) (res api.MinerSubsystems) { | |||
There was a problem hiding this comment.
Suggested change
| func PopulateEnabledMinerSubsystems(cfg config.MinerSubsystemConfig) (res api.MinerSubsystems) { | |
| func EnabledMinerSubsystems(cfg config.MinerSubsystemConfig) (res api.MinerSubsystems) { |
Populate implies "fill in" (i.e., in the config).
node/modules/storageminer.go
Outdated
| if cfg.EnableMarkets { | ||
| res = append(res, api.SubsystemMarkets) | ||
| } | ||
| return |
There was a problem hiding this comment.
Suggested change
| return | |
| return res |
Always better to be explicit.
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.
Fixes #6887
This PR is adding
RuntimeSubsystemsAPI endpoint, so that CLI commands such aslotus-miner infocan detect what kind of miner node they interact with, and issue the correct calls for information, depending on available subsystems.