JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/repair: reduce timeout (#3302)

Browse Source
This commit is contained in:
littleskunk 2019-10-18 13:43:24 +02:00 committed by GitHub
parent 02b9303420
commit 2a5526fcc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
satellite/repair/repairer/ec.go
View File

@ -279,7 +279,6 @@ func (ec *ECRepairer) Repair(ctx context.Context, limits []*pb.AddressedOrderLim
zap.Duration("Timer", timeout),
zap.Int("Node Count", nonNilCount(limits)),
zap.Int("Optimal Threshold", rs.OptimalThreshold()),
zap.String("Segment Path", path),
)
var successfulCount, failureCount, cancellationCount int32

6
satellite/repair/repairer/repairer.go
View File

@ -28,7 +28,7 @@ var (
type Config struct {
MaxRepair int `help:"maximum segments that can be repaired concurrently" releaseDefault:"5" devDefault:"1"`
Interval time.Duration `help:"how frequently repairer should try and repair more data" releaseDefault:"1h" devDefault:"0h5m0s"`
Timeout time.Duration `help:"time limit for uploading repaired pieces to new storage nodes" devDefault:"10m0s" releaseDefault:"2h"`
Timeout time.Duration `help:"time limit for uploading repaired pieces to new storage nodes" default:"10m0s"`
MaxBufferMem memory.Size `help:"maximum buffer memory (in bytes) to be allocated for read buffers" default:"4M"`
MaxExcessRateOptimalThreshold float64 `help:"ratio applied to the optimal threshold to calculate the excess of the maximum number of repaired pieces to upload" default:"0.05"`
}
@ -103,7 +103,9 @@ func (service *Service) worker(ctx context.Context, seg *pb.InjuredSegment) (err
workerStartTime := time.Now().UTC()
service.log.Info("Limiter running repair on segment", zap.Binary("Segment", seg.GetPath()))
service.log.Info("Limiter running repair on segment",
zap.Binary("Segment", seg.GetPath()),
zap.String("Segment Path", string(seg.GetPath())))
// note that shouldDelete is used even in the case where err is not null
shouldDelete, err := service.repairer.Repair(ctx, string(seg.GetPath()))
if shouldDelete {

2
scripts/testdata/satellite-config.yaml.lock vendored
View File

@ -332,7 +332,7 @@ identity.key-path: /root/.local/share/storj/identity/satellite/identity.key
# repairer.max-repair: 5
# time limit for uploading repaired pieces to new storage nodes
# repairer.timeout: 2h0m0s
# repairer.timeout: 10m0s
# option for deleting tallies after they are rolled up
# rollup.delete-tallies: false