ale64bit/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#2145] meta: Do allow force inhuming a locked object

Browse source 
Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
Pavel Karpy 2022-12-14 20:23:31 +03:00 committed by Anton Nikiforov
parent a30310b2ca
commit 21c58c92a9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -58,6 +58,7 @@ Changelog for NeoFS Node
- Spawning useless `GETRANGE` with zero length for a big object (#2101) - Spawning useless `GETRANGE` with zero length for a big object (#2101)
- Incomplete object put errors do contain the deepest error's message (#2092) - Incomplete object put errors do contain the deepest error's message (#2092)
- Prioritize internal addresses for clients (#2156) - Prioritize internal addresses for clients (#2156)
- Force object removal via control service (#2145)
### Removed ### Removed
- `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands (#2089) - `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands (#2089)

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

@ -144,7 +144,7 @@ func (db *DB) Inhume(prm InhumePrm) (res InhumeRes, err error) {
cnr := prm.target[i].Container() cnr := prm.target[i].Container()
// prevent locked objects to be inhumed // prevent locked objects to be inhumed
if objectLocked(tx, cnr, id) { if !prm.forceRemoval && objectLocked(tx, cnr, id) {
return apistatus.ObjectLocked{} return apistatus.ObjectLocked{}
} }