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

[#2152] cli: Do not search for LOCK objects when delete container when session provided

Browse source 
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2022-12-16 15:14:26 +03:00 committed by Anton Nikiforov
parent 04b5ec759b
commit 33d279a3f2
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -66,6 +66,7 @@ Changelog for NeoFS Node
- Force object removal via control service (#2145) - Force object removal via control service (#2145)
- Synchronizing a tree now longer reports an error for a single-node container (#2154) - Synchronizing a tree now longer reports an error for a single-node container (#2154)
- Prevent leaking goroutines in the tree service (#2162) - Prevent leaking goroutines in the tree service (#2162)
- Do not search for LOCK objects when delete container when session provided (#2152)
### 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)

4
cmd/frostfs-cli/modules/container/delete.go
View file

@ -57,6 +57,9 @@ Only owner of the container has a permission to remove container.`,
common.PrintVerbose("Account matches the container owner.") common.PrintVerbose("Account matches the container owner.")
if tok != nil {
common.PrintVerbose("Skip searching for LOCK objects - session provided.")
} else {
fs := objectSDK.NewSearchFilters() fs := objectSDK.NewSearchFilters()
fs.AddTypeFilter(objectSDK.MatchStringEqual, objectSDK.TypeLock) fs.AddTypeFilter(objectSDK.MatchStringEqual, objectSDK.TypeLock)
@ -77,6 +80,7 @@ Only owner of the container has a permission to remove container.`,
"Use --%s flag to remove anyway.", commonflags.ForceFlag)) "Use --%s flag to remove anyway.", commonflags.ForceFlag))
} }
} }
}
var delPrm internalclient.DeleteContainerPrm var delPrm internalclient.DeleteContainerPrm
delPrm.SetClient(cli) delPrm.SetClient(cli)