TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1556] Upgrade NeoFS SDK Go with changed container API

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-06-28 10:01:05 +03:00 • committed by LeL
parent f699e82ea7
commit c165d1a9b5
36 changed files with 207 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/services/object_manager/placement/traverser.go
View file

@ -45,7 +45,8 @@ type cfg struct {
obj *oid.ID
policy *netmap.PlacementPolicy
policySet bool
policy netmap.PlacementPolicy
builder Builder
}
@ -74,11 +75,11 @@ func NewTraverser(opts ...Option) (*Traverser, error) {
if cfg.builder == nil {
return nil, fmt.Errorf("%s: %w", invalidOptsMsg, errNilBuilder)
} else if cfg.policy == nil {
} else if !cfg.policySet {
return nil, fmt.Errorf("%s: %w", invalidOptsMsg, errNilPolicy)
}
ns, err := cfg.builder.BuildPlacement(cfg.cnr, cfg.obj, *cfg.policy)
ns, err := cfg.builder.BuildPlacement(cfg.cnr, cfg.obj, cfg.policy)
if err != nil {
return nil, fmt.Errorf("could not build placement: %w", err)
}
@ -219,10 +220,11 @@ func UseBuilder(b Builder) Option {
}
// ForContainer is a traversal container setting option.
func ForContainer(cnr *container.Container) Option {
func ForContainer(cnr container.Container) Option {
return func(c *cfg) {
c.policy = cnr.PlacementPolicy()
c.cnr = container.CalculateID(cnr)
c.policySet = true
container.CalculateID(&c.cnr, cnr)
}
}