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

fix/355-increase-tree-service-client-cache-size #359

Closed
ale64bit wants to merge 156 commits from ale64bit/frostfs-node:fix/355-increase-tree-service-client-cache-size into support/v0.36
pull from: ale64bit/frostfs-node:fix/355-increase-tree-service-client-cache-size
merge into: TrueCloudLab:support/v0.36
Conversation 1 Commits 156 Files changed 584 +23 -9
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 299b24b974 - Show all commits

32
pkg/services/tree/sync.go
View file

@ -204,6 +204,11 @@ func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID stri
rawCID := make([]byte, sha256.Size) rawCID := make([]byte, sha256.Size)
cid.Encode(rawCID) cid.Encode(rawCID)
const treeApplyWorkersCount = 1024
errGroup, egCtx := errgroup.WithContext(ctx)
errGroup.SetLimit(treeApplyWorkersCount)
var heightMtx sync.Mutex
for { for {
newHeight := height newHeight := height
req := &GetOpLogRequest{ req := &GetOpLogRequest{
@ -217,7 +222,7 @@ func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID stri
return newHeight, err return newHeight, err
} }
c, err := treeClient.GetOpLog(ctx, req) c, err := treeClient.GetOpLog(egCtx, req)
if err != nil { if err != nil {
return newHeight, fmt.Errorf("can't initialize client: %w", err) return newHeight, fmt.Errorf("can't initialize client: %w", err)
} }
@ -230,16 +235,25 @@ func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID stri
Child: lm.ChildId, Child: lm.ChildId,
} }
if err := m.Meta.FromBytes(lm.Meta); err != nil { if err := m.Meta.FromBytes(lm.Meta); err != nil {
_ = errGroup.Wait()
return newHeight, err return newHeight, err
} }
if err := s.forest.TreeApply(ctx, cid, treeID, m, true); err != nil { errGroup.Go(func() error {
return newHeight, err if err := s.forest.TreeApply(egCtx, cid, treeID, m, true); err != nil {
} return err
if m.Time > newHeight { }
newHeight = m.Time + 1 heightMtx.Lock()
} else { if m.Time > newHeight {
newHeight++ newHeight = m.Time + 1
} } else {
newHeight++
}
heightMtx.Unlock()
return nil
})
}
if errGroupErr := errGroup.Wait(); errGroupErr != nil {
return newHeight, err
} }
if height == newHeight || err != nil && !errors.Is(err, io.EOF) { if height == newHeight || err != nil && !errors.Is(err, io.EOF) {
return newHeight, err return newHeight, err