From 9920425db9bf00c49020e890fe98b67aa687f69d Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 12 May 2021 12:30:52 +0300 Subject: [PATCH] [#493] node: Abolish tombstone lifetime configuration There is no need to change this value for now. Signed-off-by: Leonard Lyubich --- cmd/neofs-node/config.go | 4 ---- cmd/neofs-node/object.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go index 8c10ecc41..48eddf718 100644 --- a/cmd/neofs-node/config.go +++ b/cmd/neofs-node/config.go @@ -139,8 +139,6 @@ const ( cfgGCRemoverSleepInt = "remover_sleep_interval" ) -const cfgTombstoneLifetime = "tombstone_lifetime" - const ( addressSize = 72 // 32 bytes oid, 32 bytes cid, 8 bytes protobuf encoding ) @@ -464,8 +462,6 @@ func defaultConfiguration(v *viper.Viper) { v.SetDefault(cfgObjectRangeHashPoolSize, 10) v.SetDefault(cfgCtrlSvcAuthorizedKeys, []string{}) - - v.SetDefault(cfgTombstoneLifetime, 5) } func (c *cfg) LocalAddress() *network.Address { diff --git a/cmd/neofs-node/object.go b/cmd/neofs-node/object.go index f4de4e16d..a4398accc 100644 --- a/cmd/neofs-node/object.go +++ b/cmd/neofs-node/object.go @@ -290,7 +290,7 @@ func initObjectService(c *cfg) { deletesvc.WithPutService(sPut), deletesvc.WithNetworkInfo(&delNetInfo{ State: c.cfgNetmap.state, - tsLifetime: c.viper.GetUint64(cfgTombstoneLifetime), + tsLifetime: 5, }), )