TrueCloudLab/frostfs-rest-gw
Archived
17
0
Fork 6
Code Issues 2 Pull requests 1 Projects Releases Activity Actions

Feature/36 frostfs storage group management #5

Open
KirillovDenis wants to merge 7 commits from KirillovDenis/feature/36-frostfs-storage_group_management into master
pull from: KirillovDenis/feature/36-frostfs-storage_group_management
merge into: TrueCloudLab:master
Conversation 0 Commits 7 Files changed 25 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 739447579a - Show all commits

6
handlers/storagegroup.go
View file

@ -275,12 +275,12 @@ func (a *API) formStorageGroup(ctx context.Context, cnrID cid.ID, btoken bearer.
return nil, fmt.Errorf("parse storage group members: %w", err) return nil, fmt.Errorf("parse storage group members: %w", err)
} }
needCalcHash, err := isHomomorphicHashingDisabled(ctx, a.pool, cnrID) hashDisabled, err := isHomomorphicHashingDisabled(ctx, a.pool, cnrID)
if err != nil { if err != nil {
return nil, fmt.Errorf("check if homomorphic hash disabled: %w", err) return nil, fmt.Errorf("check if homomorphic hash disabled: %w", err)
} }
sgSize, cs, err := a.getStorageGroupSizeAndHash(ctx, cnrID, btoken, members, needCalcHash) sgSize, cs, err := a.getStorageGroupSizeAndHash(ctx, cnrID, btoken, members, !hashDisabled)
if err != nil { if err != nil {
return nil, fmt.Errorf("get storage group size: %w", err) return nil, fmt.Errorf("get storage group size: %w", err)
} }
@ -295,7 +295,7 @@ func (a *API) formStorageGroup(ctx context.Context, cnrID cid.ID, btoken bearer.
sg.SetValidationDataSize(sgSize) sg.SetValidationDataSize(sgSize)
sg.SetExpirationEpoch(networkInfo.CurrentEpoch() + uint64(*storageGroup.Lifetime)) sg.SetExpirationEpoch(networkInfo.CurrentEpoch() + uint64(*storageGroup.Lifetime))
if needCalcHash { if !hashDisabled {
sg.SetValidationDataHash(*cs) sg.SetValidationDataHash(*cs)
} }