forked from TrueCloudLab/frostfs-node
[#1329] tree: Fix sync applying
Add the node position in a container and the container size to the CID descriptor that is passed to the `TreeApply`. Previously, `checkValid` does not allow any log operarations. Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
parent
c16a31ef3e
commit
bc67f77d86
1 changed files with 8 additions and 4 deletions
|
@ -29,6 +29,11 @@ func (s *Service) Synchronize(ctx context.Context, cid cid.ID, treeID string) er
|
||||||
return ErrNotInContainer
|
return ErrNotInContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var d pilorama.CIDDescriptor
|
||||||
|
d.CID = cid
|
||||||
|
d.Position = pos
|
||||||
|
d.Size = len(nodes)
|
||||||
|
|
||||||
lm, err := s.forest.TreeGetOpLog(cid, treeID, 0)
|
lm, err := s.forest.TreeGetOpLog(cid, treeID, 0)
|
||||||
if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) {
|
if err != nil && !errors.Is(err, pilorama.ErrTreeNotFound) {
|
||||||
return err
|
return err
|
||||||
|
@ -50,7 +55,7 @@ func (s *Service) Synchronize(ctx context.Context, cid cid.ID, treeID string) er
|
||||||
|
|
||||||
treeClient := NewTreeServiceClient(cc)
|
treeClient := NewTreeServiceClient(cc)
|
||||||
for {
|
for {
|
||||||
h, err := s.synchronizeSingle(ctx, cid, treeID, height, treeClient)
|
h, err := s.synchronizeSingle(ctx, d, treeID, height, treeClient)
|
||||||
if height < h {
|
if height < h {
|
||||||
height = h
|
height = h
|
||||||
}
|
}
|
||||||
|
@ -64,9 +69,9 @@ func (s *Service) Synchronize(ctx context.Context, cid cid.ID, treeID string) er
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) {
|
func (s *Service) synchronizeSingle(ctx context.Context, d pilorama.CIDDescriptor, treeID string, height uint64, treeClient TreeServiceClient) (uint64, error) {
|
||||||
rawCID := make([]byte, sha256.Size)
|
rawCID := make([]byte, sha256.Size)
|
||||||
cid.Encode(rawCID)
|
d.CID.Encode(rawCID)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
newHeight := height
|
newHeight := height
|
||||||
|
@ -96,7 +101,6 @@ func (s *Service) synchronizeSingle(ctx context.Context, cid cid.ID, treeID stri
|
||||||
if err := m.Meta.FromBytes(lm.Meta); err != nil {
|
if err := m.Meta.FromBytes(lm.Meta); err != nil {
|
||||||
return newHeight, err
|
return newHeight, err
|
||||||
}
|
}
|
||||||
d := pilorama.CIDDescriptor{CID: cid}
|
|
||||||
if err := s.forest.TreeApply(d, treeID, m); err != nil {
|
if err := s.forest.TreeApply(d, treeID, m); err != nil {
|
||||||
return newHeight, err
|
return newHeight, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue