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

error handling in heldamount cash and collector delete fixed

Browse Source 
Change-Id: I8fe58c50f844a6b819eacc14a40bc5c67268ed5c
This commit is contained in:
Qweder93 2020-07-21 16:10:46 +03:00 committed by Nikolai Siedov
parent 96c83eb0b8
commit aa6afc3879
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
satellite/heldamount/endpoint.go
View File

@ -51,10 +51,6 @@ func (e *Endpoint) GetPayStub(ctx context.Context, req *pb.GetHeldAmountRequest)
}
node, err := e.overlay.Get(ctx, peer.ID)
if err != nil {
if overlay.ErrNodeNotFound.Has(err) {
return nil, nil
}
return nil, rpcstatus.Error(rpcstatus.Internal, err.Error())
}
@ -107,7 +103,7 @@ func (e *Endpoint) GetAllPaystubs(ctx context.Context, req *pb.GetAllPaystubsReq
node, err := e.overlay.Get(ctx, peer.ID)
if err != nil {
if overlay.ErrNodeNotFound.Has(err) {
return nil, nil
return &pb.GetAllPaystubsResponse{}, nil
}
return nil, rpcstatus.Error(rpcstatus.Internal, err.Error())
@ -173,10 +169,6 @@ func (e *Endpoint) GetPayment(ctx context.Context, req *pb.GetPaymentRequest) (_
}
node, err := e.overlay.Get(ctx, peer.ID)
if err != nil {
if overlay.ErrNodeNotFound.Has(err) {
return nil, nil
}
return nil, rpcstatus.Error(rpcstatus.Internal, err.Error())
}
@ -215,7 +207,7 @@ func (e *Endpoint) GetAllPayments(ctx context.Context, req *pb.GetAllPaymentsReq
node, err := e.overlay.Get(ctx, peer.ID)
if err != nil {
if overlay.ErrNodeNotFound.Has(err) {
return nil, nil
return &pb.GetAllPaymentsResponse{}, nil
}
return nil, rpcstatus.Error(rpcstatus.Internal, err.Error())

6
storagenode/collector/service.go
View File

@ -6,6 +6,8 @@ package collector
import (
"context"
"errors"
"os"
"time"
"github.com/spacemonkeygo/monkit/v3"
@ -94,6 +96,10 @@ func (service *Service) Collect(ctx context.Context, now time.Time) (err error)
for _, expired := range infos {
err := service.pieces.Delete(ctx, expired.SatelliteID, expired.PieceID)
if err != nil {
if os.IsNotExist(errors.Unwrap(err)) {
service.log.Info("file does not exist", zap.Stringer("Satellite ID", expired.SatelliteID), zap.Stringer("Piece ID", expired.PieceID))
continue
}
errfailed := service.pieces.DeleteFailed(ctx, expired, now)
if errfailed != nil {
service.log.Error("unable to update piece info", zap.Stringer("Satellite ID", expired.SatelliteID), zap.Stringer("Piece ID", expired.PieceID), zap.Error(errfailed))