achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#726] writecache: Fix small object flush for Badger

Browse source 
Do not marshal object twice.

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2023-10-06 11:31:40 +03:00
parent 997ac7cd8d
commit d07afd803c
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/local_object_storage/writecache/writecachebadger/cachebadger.go
View file

@ -21,7 +21,7 @@ type cache struct {
modeMtx sync.RWMutex modeMtx sync.RWMutex
// flushCh is a channel with objects to flush. // flushCh is a channel with objects to flush.
flushCh chan *objectSDK.Object flushCh chan objectInfo
// scheduled4Flush contains objects scheduled for flush via flushCh // scheduled4Flush contains objects scheduled for flush via flushCh
// helps to avoid multiple flushing of one object // helps to avoid multiple flushing of one object
scheduled4Flush map[oid.Address]struct{} scheduled4Flush map[oid.Address]struct{}
@ -52,7 +52,7 @@ const (
// New creates new writecache instance. // New creates new writecache instance.
func New(opts ...Option) writecache.Cache { func New(opts ...Option) writecache.Cache {
c := &cache{ c := &cache{
flushCh: make(chan *objectSDK.Object), flushCh: make(chan objectInfo),
mode: mode.ReadWrite, mode: mode.ReadWrite,
scheduled4Flush: map[oid.Address]struct{}{}, scheduled4Flush: map[oid.Address]struct{}{},

17
pkg/local_object_storage/writecache/writecachebadger/flush.go
View file

@ -85,7 +85,11 @@ func (c *collector) Send(buf *z.Buffer) error {
c.cache.scheduled4FlushMtx.Unlock() c.cache.scheduled4FlushMtx.Unlock()
c.scheduled++ c.scheduled++
select { select {
case c.cache.flushCh <- obj: case c.cache.flushCh <- objectInfo{
addr: addr,
data: val,
obj: obj,
}:
case <-c.cache.closeCh: case <-c.cache.closeCh:
c.cancel() c.cancel()
return nil return nil
@ -175,22 +179,21 @@ func (c *cache) reportFlushError(msg string, addr string, err error) {
func (c *cache) workerFlushSmall() { func (c *cache) workerFlushSmall() {
defer c.wg.Done() defer c.wg.Done()
var obj *objectSDK.Object var objInfo objectInfo
for { for {
// Give priority to direct put. // Give priority to direct put.
select { select {
case obj = <-c.flushCh: case objInfo = <-c.flushCh:
case <-c.closeCh: case <-c.closeCh:
return return
} }
addr := objectCore.AddressOf(obj) err := c.flushObject(context.TODO(), objInfo.obj, objInfo.data, writecache.StorageTypeDB)
err := c.flushObject(context.TODO(), obj, nil, writecache.StorageTypeDB)
if err == nil { if err == nil {
c.deleteFromDB([]internalKey{addr2key(addr)}) c.deleteFromDB([]internalKey{addr2key(objInfo.addr)})
} }
c.scheduled4FlushMtx.Lock() c.scheduled4FlushMtx.Lock()
delete(c.scheduled4Flush, addr) delete(c.scheduled4Flush, objInfo.addr)
c.scheduled4FlushMtx.Unlock() c.scheduled4FlushMtx.Unlock()
} }
} }