TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 4 Projects Releases 1 Activity Actions

[#195] services/object: Write debug log messages on worker pool errors

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-23 15:23:32 +03:00 committed by Alex Vanin
parent fa6e4a3ca4
commit 46dab77705
6 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/services/object/head/distributed.go
View file

@ -125,7 +125,9 @@ loop:
h.w.write(head) h.w.write(head)
}); err != nil { }); err != nil {
wg.Done() wg.Done()
// TODO: log error
svcutil.LogWorkerPoolError(h.log, "HEAD", err)
break loop break loop
} }
} }

4
pkg/services/object/put/distributed.go
View file

@ -103,7 +103,9 @@ loop:
traverser.SubmitSuccess() traverser.SubmitSuccess()
}); err != nil { }); err != nil {
wg.Done() wg.Done()
// TODO: log error
svcutil.LogWorkerPoolError(t.log, "PUT", err)
break loop break loop
} }
} }

4
pkg/services/object/range/streamer.go
View file

@ -205,7 +205,9 @@ loop:
nextRange.SetOffset(nextRange.GetOffset() + uw) nextRange.SetOffset(nextRange.GetOffset() + uw)
}); err != nil { }); err != nil {
wg.Done() wg.Done()
// TODO: log error
svcutil.LogWorkerPoolError(p.log, "RANGE", err)
break loop break loop
} }

4
pkg/services/object/rangehash/distributed.go
View file

@ -125,7 +125,9 @@ loop:
} }
}); err != nil { }); err != nil {
wg.Done() wg.Done()
// TODO: log error
svcutil.LogWorkerPoolError(h.log, "RANGEHASH", err)
break loop break loop
} }
} }

10
pkg/services/object/search/streamer.go
View file

@ -8,7 +8,7 @@ import (
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util" svcutil "github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -113,7 +113,7 @@ func (p *Streamer) preparePrm(prm *Prm) error {
traverseOpts = append(traverseOpts, placement.SuccessAfter(1)) traverseOpts = append(traverseOpts, placement.SuccessAfter(1))
// use local-only placement builder // use local-only placement builder
builder = util.NewLocalPlacement(builder, p.localAddrSrc) builder = svcutil.NewLocalPlacement(builder, p.localAddrSrc)
} }
// set placement builder // set placement builder
@ -169,11 +169,13 @@ loop:
} }
if err := streamer.stream(p.ctx, p.ch); err != nil { if err := streamer.stream(p.ctx, p.ch); err != nil {
util.LogServiceError(p.log, "SEARCH", addr, err) svcutil.LogServiceError(p.log, "SEARCH", addr, err)
} }
}); err != nil { }); err != nil {
wg.Done() wg.Done()
// TODO: log error
svcutil.LogWorkerPoolError(p.log, "SEARCH", err)
break loop break loop
} }
} }

8
pkg/services/object/util/log.go
View file

@ -14,3 +14,11 @@ func LogServiceError(l *logger.Logger, req string, node *network.Address, err er
zap.String("error", err.Error()), zap.String("error", err.Error()),
) )
} }
// LogWorkerPoolError writes debug error message of object worker pool to provided logger.
func LogWorkerPoolError(l *logger.Logger, req string, err error) {
l.Debug("could not push task to worker pool",
zap.String("request", req),
zap.String("error", err.Error()),
)
}