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

[#568] shard/writecache: Maintain memory size and db size

Browse source 
Signed-off-by: ZhangTao1596 <zhangtao@ngd.neo.org>
This commit is contained in:
ZhangTao1596 2021-06-21 17:42:09 +08:00 • committed by Alex Vanin
parent adbbad0beb
commit 9b87e6267d
4 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkg/local_object_storage/writecache/delete.go
View file

@ -19,6 +19,7 @@ func (c *cache) Delete(addr *objectSDK.Address) error {
if saddr == c.mem[i].addr {
copy(c.mem[i:], c.mem[i+1:])
c.mem = c.mem[:len(c.mem)-1]
c.curMemSize -= uint64(len(c.mem[i].data))
c.mtx.Unlock()
return nil
}
@ -26,18 +27,24 @@ func (c *cache) Delete(addr *objectSDK.Address) error {
c.mtx.Unlock()
// Check disk cache.
has := false
var has int
_ = c.db.View(func(tx *bbolt.Tx) error {
b := tx.Bucket(defaultBucket)
has = b.Get([]byte(saddr)) != nil
has = len(b.Get([]byte(saddr)))
return nil
})
if has {
return c.db.Update(func(tx *bbolt.Tx) error {
if 0 < has {
err := c.db.Update(func(tx *bbolt.Tx) error {
b := tx.Bucket(defaultBucket)
return b.Delete([]byte(saddr))
err := b.Delete([]byte(saddr))
return err
})
if err != nil {
return err
}
c.dbSize.Sub(uint64(has))
return nil
}
err := c.fsTree.Delete(addr)