TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 96 Pull requests 4 Projects Releases 1 Activity Actions

[#40] cmd/neofs-node: Remove max object size value from config

Browse source 
Now max object size value is taken from global config in sidechain.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-10-23 14:06:55 +03:00 committed by Alex Vanin
parent 23f00a3cd2
commit 0c3e6c7a04
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/neofs-node/config.go
View file

@ -50,7 +50,6 @@ const (
cfgNodeKey = "node.key" cfgNodeKey = "node.key"
cfgBootstrapAddress = "node.address" cfgBootstrapAddress = "node.address"
cfgNodeAttributePrefix = "node.attribute" cfgNodeAttributePrefix = "node.attribute"
cfgMaxObjectSize = "node.maxobjectsize" // todo: get value from chain
// config keys for cfgGRPC // config keys for cfgGRPC
cfgListenAddress = "grpc.endpoint" cfgListenAddress = "grpc.endpoint"
@ -186,8 +185,6 @@ type cfgObject struct {
cnrStorage container.Source cnrStorage container.Source
maxObjectSize uint64
metastorage bucket.Bucket metastorage bucket.Bucket
blobstorage bucket.Bucket blobstorage bucket.Bucket
@ -254,9 +251,6 @@ func initCfg(path string) *cfg {
bootType: StorageNode, bootType: StorageNode,
attributes: parseAttributes(viperCfg), attributes: parseAttributes(viperCfg),
}, },
cfgObject: cfgObject{
maxObjectSize: viperCfg.GetUint64(cfgMaxObjectSize),
},
cfgGRPC: cfgGRPC{ cfgGRPC: cfgGRPC{
maxChunkSize: maxChunkSize, maxChunkSize: maxChunkSize,
maxAddrAmount: maxAddrAmount, maxAddrAmount: maxAddrAmount,
@ -297,8 +291,7 @@ func initViper(path string) *viper.Viper {
func defaultConfiguration(v *viper.Viper) { func defaultConfiguration(v *viper.Viper) {
// fixme: all hardcoded private keys must be removed // fixme: all hardcoded private keys must be removed
v.SetDefault(cfgNodeKey, "Kwk6k2eC3L3QuPvD8aiaNyoSXgQ2YL1bwS5CP1oKoA9waeAze97s") v.SetDefault(cfgNodeKey, "Kwk6k2eC3L3QuPvD8aiaNyoSXgQ2YL1bwS5CP1oKoA9waeAze97s")
v.SetDefault(cfgBootstrapAddress, "") // address to bootstrap with v.SetDefault(cfgBootstrapAddress, "") // address to bootstrap with
v.SetDefault(cfgMaxObjectSize, 1024*1024) // default max object size 1 megabyte
v.SetDefault(cfgMorphRPCAddress, "http://morph_chain.localtest.nspcc.ru:30333/") v.SetDefault(cfgMorphRPCAddress, "http://morph_chain.localtest.nspcc.ru:30333/")
v.SetDefault(cfgMorphNotifyRPCAddress, "ws://morph_chain:30333/ws") v.SetDefault(cfgMorphNotifyRPCAddress, "ws://morph_chain:30333/ws")