TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 105 Pull requests 13 Projects Releases 2 Activity Actions

Move diff from nspcc master and support branches #28

Merged
fyrchik merged 28 commits from move-changes into master 2023-01-25 12:31:47 +00:00
Conversation 0 Commits 28 Files changed 50 +5 -2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 42dd042b8a - Show all commits

2
pkg/services/tree/replicator.go
View file

@ -148,7 +148,7 @@ func (s *Service) pushToQueue(cid cidSDK.ID, treeID string, op *pilorama.LogMove
treeID: treeID, treeID: treeID,
op: op, op: op,
}: }:
case <-s.closeCh: default:
} }
} }

5
pkg/services/tree/service.go
View file

@ -485,7 +485,8 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e
return nil, fmt.Errorf("can't parse meta-information: %w", err) return nil, fmt.Errorf("can't parse meta-information: %w", err)
} }
s.replicateLocalCh <- applyOp{ select {
case s.replicateLocalCh <- applyOp{
treeID: req.GetBody().GetTreeId(), treeID: req.GetBody().GetTreeId(),
CIDDescriptor: pilorama.CIDDescriptor{CID: cid, Position: pos, Size: size}, CIDDescriptor: pilorama.CIDDescriptor{CID: cid, Position: pos, Size: size},
Move: pilorama.Move{ Move: pilorama.Move{
@ -493,6 +494,8 @@ func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, e
Child: op.GetChildId(), Child: op.GetChildId(),
Meta: meta, Meta: meta,
}, },
}:
default:
} }
return &ApplyResponse{Body: &ApplyResponse_Body{}, Signature: &Signature{}}, nil return &ApplyResponse{Body: &ApplyResponse_Body{}, Signature: &Signature{}}, nil
} }