TrueCloudLab/frostfs-node
17
1
Fork 27
Code Issues 90 Pull requests 3 Projects Releases 1 Activity Actions

Improvements here and there about notary deposits. #184

Merged
fyrchik merged 4 commits from carpawell/frostfs-node:fix/notary-deposit into master 2023-03-29 10:34:55 +00:00
Conversation 0 Commits 4 Files changed 6 +4 -4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c218d7a259 - Show all commits

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++ {
select {
case <-ctx.Done():
return nil
return ctx.Err()
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 {
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
default:
return false
@ -236,7 +236,7 @@ func (e *StorageEngine) processDeletedLocks(ctx context.Context, lockers []oid.A
select {
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
default:
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 {
select {
case <-ctx.Done():
return nil
return ctx.Err()
default:
}