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

satellite/{metabase,metainfo}: add some missing monitoring

Browse Source 
Change-Id: Ie0018f6385bb145d0a514dfe2792f3f299b55b79
This commit is contained in:
Egon Elbre 2021-10-21 09:47:45 +03:00
parent bdadc4b460
commit 187941ff86
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satellite/metabase/delete.go
View File

@ -457,6 +457,7 @@ func (db *DB) DeleteObjectsAllVersions(ctx context.Context, opts DeleteObjectsAl
}
func (db *DB) scanObjectDeletion(ctx context.Context, location ObjectLocation, rows tagsql.Rows) (objects []Object, segments []DeletedSegmentInfo, err error) {
defer mon.Task()(&ctx)(&err)
defer func() { err = errs.Combine(err, rows.Close()) }()
objects = make([]Object, 0, 10)
@ -508,6 +509,7 @@ func (db *DB) scanObjectDeletion(ctx context.Context, location ObjectLocation, r
}
func (db *DB) scanMultipleObjectsDeletion(ctx context.Context, rows tagsql.Rows) (objects []Object, segments []DeletedSegmentInfo, err error) {
defer mon.Task()(&ctx)(&err)
defer func() { err = errs.Combine(err, rows.Close()) }()
objects = make([]Object, 0, 10)

7
satellite/metainfo/metainfo.go
View File

@ -2458,6 +2458,7 @@ func (endpoint *Endpoint) DeletePendingObject(ctx context.Context, stream metaba
}
func (endpoint *Endpoint) deleteObjectsPieces(ctx context.Context, result metabase.DeleteObjectResult) (deletedObjects []*pb.Object, err error) {
defer mon.Task()(&ctx)(&err)
// We should ignore client cancelling and always try to delete segments.
ctx = context2.WithoutCancellation(ctx)
@ -2476,6 +2477,9 @@ func (endpoint *Endpoint) deleteObjectsPieces(ctx context.Context, result metaba
}
func (endpoint *Endpoint) deleteSegmentPieces(ctx context.Context, segments []metabase.DeletedSegmentInfo) {
var err error
defer mon.Task()(&ctx)(&err)
nodesPieces := groupPiecesByNodeID(segments)
var requests []piecedeletion.Request
@ -2490,7 +2494,8 @@ func (endpoint *Endpoint) deleteSegmentPieces(ctx context.Context, segments []me
// Only return an error if we failed to delete the objects. If we failed
// to delete pieces, let garbage collector take care of it.
if err := endpoint.deletePieces.Delete(ctx, requests, deleteObjectPiecesSuccessThreshold); err != nil {
err = endpoint.deletePieces.Delete(ctx, requests, deleteObjectPiecesSuccessThreshold)
if err != nil {
endpoint.log.Error("failed to delete pieces", zap.Error(err))
}
}