1462824ab8
a1696a8 introduced some logic which in some situations prevented big objects
to be persisted in FSTree. In this commit a refactoring is done with the
goal of simplifying the code and also checking #866 issue.
1. Split a monstrous function into multiple simple ones: memory objects
can only be small and for writing through the cache we can do a dispatch
in `Put` itself.
2. Determine objects to be put in database before the actual update
as setting up a transaction has non-zero overhead.
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
64 lines
1.5 KiB
Go
64 lines
1.5 KiB
Go
package writecache
|
|
|
|
import (
|
|
"errors"
|
|
|
|
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
|
|
"github.com/nspcc-dev/neofs-node/pkg/core/object"
|
|
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree"
|
|
storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log"
|
|
"go.etcd.io/bbolt"
|
|
)
|
|
|
|
// Delete removes object from write-cache.
|
|
func (c *cache) Delete(addr *objectSDK.Address) error {
|
|
saddr := addr.String()
|
|
|
|
// Check memory cache.
|
|
c.mtx.Lock()
|
|
for i := range c.mem {
|
|
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()
|
|
storagelog.Write(c.log, storagelog.AddressField(saddr), storagelog.OpField("in-mem DELETE"))
|
|
return nil
|
|
}
|
|
}
|
|
c.mtx.Unlock()
|
|
|
|
// Check disk cache.
|
|
var has int
|
|
_ = c.db.View(func(tx *bbolt.Tx) error {
|
|
b := tx.Bucket(defaultBucket)
|
|
has = len(b.Get([]byte(saddr)))
|
|
return nil
|
|
})
|
|
|
|
if 0 < has {
|
|
err := c.db.Update(func(tx *bbolt.Tx) error {
|
|
b := tx.Bucket(defaultBucket)
|
|
err := b.Delete([]byte(saddr))
|
|
return err
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
storagelog.Write(c.log, storagelog.AddressField(saddr), storagelog.OpField("db DELETE"))
|
|
c.objCounters.DecDB()
|
|
return nil
|
|
}
|
|
|
|
err := c.fsTree.Delete(addr)
|
|
if errors.Is(err, fstree.ErrFileNotFound) {
|
|
err = object.ErrNotFound
|
|
}
|
|
|
|
if err == nil {
|
|
storagelog.Write(c.log, storagelog.AddressField(saddr), storagelog.OpField("fstree DELETE"))
|
|
c.objCounters.DecFS()
|
|
}
|
|
|
|
return err
|
|
}
|