TrueCloudLab/frostfs-node
17
1
Fork 23
Code Issues 97 Pull requests 7 Projects Releases 1 Activity Actions

adm: Fix dump-config output #1139

Closed
elebedeva wants to merge 1 commit from elebedeva:fix/ffs-adm-output into master
pull from: elebedeva:fix/ffs-adm-output
merge into: TrueCloudLab:master
Conversation 1 Commits 1 Files changed 2 +10 -1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/frostfs-adm/internal/modules/morph/config/config.go
View file

@ -61,7 +61,9 @@ func dumpNetworkConfig(cmd *cobra.Command, _ []string) error {
case netmap.ContainerFeeConfig, netmap.ContainerAliasFeeConfig,
netmap.EpochDurationConfig, netmap.IrCandidateFeeConfig,
netmap.MaxObjectSizeConfig, netmap.WithdrawFeeConfig,
netmap.MaxECDataCountConfig, netmap.MaxECParityCountConfig:
netmap.MaxECDataCountConfig, netmap.MaxECParityCountConfig,
fyrchik marked this conversation as resolved
fyrchik commented 2024-05-17 13:15:14 +00:00
Review
Copy link

The task was mostly about EC fields.
The others were intentionally deleted, as they are unused and thus are output in hex as the default format.

The task was mostly about EC fields. The others were intentionally deleted, as they are unused and thus are output in hex as the default format.
elebedeva commented 2024-05-21 11:09:13 +00:00
Review
Copy link

Then there is no problem to fix, closing PR.

Then there is no problem to fix, closing PR.
netmap.EigenTrustIterationsConfig, netmap.BasicIncomeRateConfig,
netmap.AuditFeeConfig:
nbuf := make([]byte, 8)
copy(nbuf[:], v)
n := binary.LittleEndian.Uint64(nbuf)
@ -71,6 +73,9 @@ func dumpNetworkConfig(cmd *cobra.Command, _ []string) error {
return helper.InvalidConfigValueErr(k)
}
_, _ = tw.Write([]byte(fmt.Sprintf("%s:\t%t (bool)\n", k, v[0] == 1)))
case netmap.EigenTrustAlphaConfig:
res, _ := hex.DecodeString(hex.EncodeToString(v))
_, _ = tw.Write([]byte(fmt.Sprintf("%s:\t%s (string)\n", k, res)))
default:
_, _ = tw.Write([]byte(fmt.Sprintf("%s:\t%s (hex)\n", k, hex.EncodeToString(v))))
}

4
pkg/morph/client/netmap/config.go
View file

@ -20,6 +20,10 @@ const (
WithdrawFeeConfig = "WithdrawFee"
HomomorphicHashingDisabledKey = "HomomorphicHashingDisabled"
MaintenanceModeAllowedConfig = "MaintenanceModeAllowed"
EigenTrustIterationsConfig = "EigenTrustIterations"
EigenTrustAlphaConfig = "EigenTrustAlpha"
BasicIncomeRateConfig = "BasicIncomeRate"
AuditFeeConfig = "AuditFee"
)
// MaxObjectSize receives max object size configuration