From ba4c3d9986576379e332c80e5cb8057a2a07ca01 Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Fri, 24 Jul 2020 14:01:07 +0300 Subject: [PATCH] satellite/orders: remove unused node status logging flag Change-Id: I24da78a11cc5d3d88cdf6aca85c4238e4086e59c --- satellite/api.go | 1 - satellite/core.go | 1 - satellite/orders/orders_test.go | 2 +- satellite/orders/service.go | 6 ++---- satellite/repairer.go | 1 - scripts/testdata/satellite-config.yaml.lock | 3 --- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/satellite/api.go b/satellite/api.go index 7222550ce..53d9c4970 100644 --- a/satellite/api.go +++ b/satellite/api.go @@ -333,7 +333,6 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB, Address: config.Contact.ExternalAddress, }, config.Repairer.MaxExcessRateOptimalThreshold, - config.Orders.NodeStatusLogging, ) if err := pb.DRPCRegisterOrders(peer.Server.DRPC(), peer.Orders.Endpoint); err != nil { return nil, errs.Combine(err, peer.Close()) diff --git a/satellite/core.go b/satellite/core.go index 5a402d18c..7d4dfdce6 100644 --- a/satellite/core.go +++ b/satellite/core.go @@ -274,7 +274,6 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, Address: config.Contact.ExternalAddress, }, config.Repairer.MaxExcessRateOptimalThreshold, - config.Orders.NodeStatusLogging, ) } diff --git a/satellite/orders/orders_test.go b/satellite/orders/orders_test.go index 3e6f630fb..0688685f5 100644 --- a/satellite/orders/orders_test.go +++ b/satellite/orders/orders_test.go @@ -621,7 +621,7 @@ func TestProcessOrders(t *testing.T) { func TestRandomSampleLimits(t *testing.T) { orderlimits := []*pb.AddressedOrderLimit{{}, {}, {}, {}} - s := orders.NewService(nil, nil, nil, nil, 0, nil, 0, false) + s := orders.NewService(nil, nil, nil, nil, 0, nil, 0) t.Run("sample size is less than the number of order limits", func(t *testing.T) { var nilCount int sampleSize := 2 diff --git a/satellite/orders/service.go b/satellite/orders/service.go index 336aa0b77..a28faf981 100644 --- a/satellite/orders/service.go +++ b/satellite/orders/service.go @@ -34,7 +34,7 @@ type Config struct { FlushBatchSize int `help:"how many items in the rollups write cache before they are flushed to the database" devDefault:"20" releaseDefault:"10000"` FlushInterval time.Duration `help:"how often to flush the rollups write cache to the database" devDefault:"30s" releaseDefault:"1m"` ReportedRollupsReadBatchSize int `help:"how many records to read in a single transaction when calculating billable bandwidth" default:"1000"` - NodeStatusLogging bool `help:"log the offline/disqualification status of nodes" default:"false"` + NodeStatusLogging bool `hidden:"true" help:"deprecated, log the offline/disqualification status of nodes" default:"false"` } // Service for creating order limits. @@ -48,7 +48,6 @@ type Service struct { satelliteAddress *pb.NodeAddress orderExpiration time.Duration repairMaxExcessRateOptimalThreshold float64 - nodeStatusLogging bool rngMu sync.Mutex rng *mathrand.Rand } @@ -57,7 +56,7 @@ type Service struct { func NewService( log *zap.Logger, satellite signing.Signer, overlay *overlay.Service, orders DB, orderExpiration time.Duration, satelliteAddress *pb.NodeAddress, - repairMaxExcessRateOptimalThreshold float64, nodeStatusLogging bool, + repairMaxExcessRateOptimalThreshold float64, ) *Service { return &Service{ log: log, @@ -67,7 +66,6 @@ func NewService( satelliteAddress: satelliteAddress, orderExpiration: orderExpiration, repairMaxExcessRateOptimalThreshold: repairMaxExcessRateOptimalThreshold, - nodeStatusLogging: nodeStatusLogging, rng: mathrand.New(mathrand.NewSource(time.Now().UnixNano())), } } diff --git a/satellite/repairer.go b/satellite/repairer.go index c104b451e..e7a4c5289 100644 --- a/satellite/repairer.go +++ b/satellite/repairer.go @@ -161,7 +161,6 @@ func NewRepairer(log *zap.Logger, full *identity.FullIdentity, Address: config.Contact.ExternalAddress, }, config.Repairer.MaxExcessRateOptimalThreshold, - config.Orders.NodeStatusLogging, ) } diff --git a/scripts/testdata/satellite-config.yaml.lock b/scripts/testdata/satellite-config.yaml.lock index a76f63e88..c8c1c281b 100644 --- a/scripts/testdata/satellite-config.yaml.lock +++ b/scripts/testdata/satellite-config.yaml.lock @@ -439,9 +439,6 @@ identity.key-path: /root/.local/share/storj/identity/satellite/identity.key # how often to flush the rollups write cache to the database # orders.flush-interval: 1m0s -# log the offline/disqualification status of nodes -# orders.node-status-logging: false - # how many records to read in a single transaction when calculating billable bandwidth # orders.reported-rollups-read-batch-size: 1000