george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

blobstor: close all opened blobovniczas

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-10-08 13:28:57 +03:00 committed by Alex Vanin
parent 1ebe188cdc
commit 123328a2f4
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/local_object_storage/blobstor/blobovnicza.go
View file

@ -829,8 +829,6 @@ func (b *blobovniczas) close() error {
b.activeMtx.Lock()
b.lruMtx.Lock()
b.opened.Purge()
b.lruMtx.Unlock()
for p, v := range b.active {
if err := v.blz.Close(); err != nil {
@ -839,9 +837,23 @@ func (b *blobovniczas) close() error {
zap.String("error", err.Error()),
)
}
delete(b.active, p)
b.opened.Remove(p)
}
for _, k := range b.opened.Keys() {
v, _ := b.opened.Get(k)
blz := v.(*blobovnicza.Blobovnicza)
if err := blz.Close(); err != nil {
b.log.Debug("could not close active blobovnicza",
zap.String("path", k.(string)),
zap.String("error", err.Error()),
)
}
b.opened.Remove(k)
}
b.active = make(map[string]blobovniczaWithIndex)
b.lruMtx.Unlock()
b.activeMtx.Unlock()