realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1377] oid, cid: Upgrade SDK package

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-05-12 19:37:46 +03:00 • committed by LeL
parent f65898a354
commit f15e6e888f
118 changed files with 1455 additions and 886 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/local_object_storage/metabase/inhume.go
View file

@ -108,8 +108,11 @@ func (db *DB) Inhume(prm *InhumePrm) (res *InhumeRes, err error) {
}
for i := range prm.target {
id, _ := prm.target[i].ObjectID()
cnr, _ := prm.target[i].ContainerID()
// prevent locked objects to be inhumed
if objectLocked(tx, *prm.target[i].ContainerID(), *prm.target[i].ObjectID()) {
if objectLocked(tx, cnr, id) {
return apistatus.ObjectLocked{}
}
@ -120,7 +123,7 @@ func (db *DB) Inhume(prm *InhumePrm) (res *InhumeRes, err error) {
if err == nil && obj.Type() == object.TypeRegular {
err := changeContainerSize(
tx,
obj.ContainerID(),
&cnr,
obj.PayloadSize(),
false,
)
@ -166,7 +169,7 @@ func (db *DB) Inhume(prm *InhumePrm) (res *InhumeRes, err error) {
} else {
// garbage object can probably lock some objects, so they should become
// unlocked after its decay
err = freePotentialLocks(tx, *prm.target[i].ContainerID(), *prm.target[i].ObjectID())
err = freePotentialLocks(tx, cnr, id)
if err != nil {
return fmt.Errorf("free potential locks: %w", err)
}