a-savchuk/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#521] Fix issues with transition from pkg/errors pkg

Browse source 
Wrap functions at `pkg/errors` return nil if error argument
was nil. fmt.Errorf always returns error so we need to add
missing error checks to the code.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-05-19 18:36:03 +03:00 committed by Alex Vanin
parent 71b87155ef
commit b5256ccf4c
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/neofs-node/netmap.go
View file

@ -111,7 +111,9 @@ func bootstrapNode(c *cfg) {
initState(c)
err := c.cfgNetmap.wrapper.AddPeer(c.toOnlineLocalNodeInfo())
fatalOnErr(fmt.Errorf("bootstrap error: %w", err))
if err != nil {
fatalOnErr(fmt.Errorf("bootstrap error: %w", err))
}
}
func addNetmapNotificationHandler(c *cfg, sTyp string, h event.Handler) {
@ -136,10 +138,14 @@ func setNetmapNotificationParser(c *cfg, sTyp string, p event.Parser) {
func initState(c *cfg) {
epoch, err := c.cfgNetmap.wrapper.Epoch()
fatalOnErr(fmt.Errorf("could not initialize current epoch number: %w", err))
if err != nil {
fatalOnErr(fmt.Errorf("could not initialize current epoch number: %w", err))
}
ni, err := c.netmapLocalNodeState(epoch)
fatalOnErr(fmt.Errorf("could not init network state: %w", err))
if err != nil {
fatalOnErr(fmt.Errorf("could not init network state: %w", err))
}
c.handleNodeInfoStatus(ni)

2
pkg/core/object/fmt.go
View file

@ -81,7 +81,7 @@ func (v *FormatValidator) Validate(obj *Object) error {
// TODO: combine small checks
if err := v.checkExpiration(obj); err != nil {
return fmt.Errorf("object did not pass expiration ch: %weck", err)
return fmt.Errorf("object did not pass expiration check: %w", err)
}
if err := object.CheckHeaderVerificationFields(obj.SDK()); err != nil {

6
pkg/services/object/put/streamer.go
View file

@ -157,9 +157,11 @@ func (p *Streamer) SendChunk(prm *PutChunkPrm) error {
return errNotInit
}
_, err := p.target.Write(prm.chunk)
if _, err := p.target.Write(prm.chunk); err != nil {
return fmt.Errorf("(%T) could not write payload chunk to target: %w", p, err)
}
return fmt.Errorf("(%T) could not write payload chunk to target: %w", p, err)
return nil
}
func (p *Streamer) Close() (*PutResponse, error) {