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

[#1175] object/fmt: Handle LOCK objects

Browse source 
Make `FormatValidator.ValidateContent` to verify payload of `LOCK`
objects. Pass locked objects to `Locker` interface. Require from
`Locker.Lock` to return `apistatus.IrregularObjectLock` error on a
corresponding condition.

Also add error return to `DeleteHandler.DeleteObjects` method. Require
from method to return `apistatus.ObjectLocked` error on a corresponding
condition. Adopt implementations.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-02-16 18:49:19 +03:00 • committed by LeL
parent d163008b63
commit ced854bc2e
5 changed files with 63 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/local_object_storage/engine/lock.go
View file

@ -32,11 +32,11 @@ func (e *StorageEngine) lock(idCnr cid.ID, locker oid.ID, locked []oid.ID) error
for i := range locked {
switch e.lockSingle(idCnr, locker, locked[i], true) {
case 1:
return apistatus.IrregularObjectLock{}
return apistatus.LockNonRegularObject{}
case 0:
switch e.lockSingle(idCnr, locker, locked[i], false) {
case 1:
return apistatus.IrregularObjectLock{}
return apistatus.LockNonRegularObject{}
case 0:
return errLockFailed
}
@ -53,7 +53,7 @@ func (e *StorageEngine) lock(idCnr cid.ID, locker oid.ID, locked []oid.ID) error
func (e *StorageEngine) lockSingle(idCnr cid.ID, locker, locked oid.ID, checkExists bool) (status uint8) {
// code is pretty similar to inhumeAddr, maybe unify?
root := false
var errIrregular apistatus.IrregularObjectLock
var errIrregular apistatus.LockNonRegularObject
var addrLocked address.Address
addrLocked.SetContainerID(&idCnr)

2
pkg/local_object_storage/metabase/lock.go
View file

@ -42,7 +42,7 @@ func (db *DB) Lock(cnr cid.ID, locker oid.ID, locked []oid.ID) error {
}
if firstIrregularObjectType(tx, cnr, bucketKeysLocked...) != object.TypeRegular {
return apistatus.IrregularObjectLock{}
return apistatus.LockNonRegularObject{}
}
bucketLocked, err := tx.CreateBucketIfNotExists(bucketNameLocked)

2
pkg/local_object_storage/metabase/lock_test.go
View file

@ -37,7 +37,7 @@ func TestDB_Lock(t *testing.T) {
err := meta.Put(db, obj, nil)
require.NoError(t, err, typ)
var e apistatus.IrregularObjectLock
var e apistatus.LockNonRegularObject
// try to lock it
err = db.Lock(cnr, *oidtest.ID(), []oid.ID{*obj.ID()})