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

[#184] *: Unify done contexts handling

Browse source 
If `ctx.Done()`, return `ctx.Err()` in every function that returns an error.

Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
Pavel Karpy 2023-03-28 17:58:28 +03:00 committed by Gitea
parent 221203beeb
commit 97e201993b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/innerring/notary.go
View file

@ -88,7 +88,7 @@ func awaitNotaryDepositInClient(ctx context.Context, cli *client.Client, txHash
for i := 0; i < notaryDepositTimeout; i++ { for i := 0; i < notaryDepositTimeout; i++ {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return nil return ctx.Err()
default: default:
} }

4
pkg/local_object_storage/engine/inhume.go
View file

@ -222,7 +222,7 @@ func (e *StorageEngine) processExpiredLocks(ctx context.Context, lockers []oid.A
select { select {
case <-ctx.Done(): case <-ctx.Done():
e.log.Info("interrupt processing the expired locks by context") e.log.Info("interrupt processing the expired locks", zap.Error(ctx.Err()))
return true return true
default: default:
return false return false
@ -236,7 +236,7 @@ func (e *StorageEngine) processDeletedLocks(ctx context.Context, lockers []oid.A
select { select {
case <-ctx.Done(): case <-ctx.Done():
e.log.Info("interrupt processing the deleted locks by context") e.log.Info("interrupt processing the deleted locks", zap.Error(ctx.Err()))
return true return true
default: default:
return false return false

2
pkg/morph/client/client.go
View file

@ -340,7 +340,7 @@ func (c *Client) Wait(ctx context.Context, n uint32) error {
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return nil return ctx.Err()
default: default:
} }