TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 98 Pull requests 3 Projects Releases 1 Activity Actions

Simplify writecache #377

Merged
fyrchik merged 3 commits from fyrchik/frostfs-node:refactor/simplify-WC into master 2023-05-19 09:37:06 +00:00
Conversation 0 Commits 3 Files changed 9 +7 -7
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cfcefc48bc - Show all commits

14
pkg/local_object_storage/writecache/flush.go
View file

@ -37,12 +37,12 @@ const (
func (c *cache) runFlushLoop() {
for i := 0; i < c.workersCount; i++ {
c.wg.Add(1)
go c.flushWorker(i)
go c.workerFlushSmall()
}
c.wg.Add(1)
go func() {
c.flushBigObjects(context.TODO())
c.workerFlushBig(context.TODO())
c.wg.Done()
}()
@ -56,7 +56,7 @@ func (c *cache) runFlushLoop() {
for {
select {
case <-tt.C:
c.flushDB()
c.flushSmallObjects()
tt.Reset(defaultFlushInterval)
case <-c.closeCh:
return
@ -65,7 +65,7 @@ func (c *cache) runFlushLoop() {
}()
}
func (c *cache) flushDB() {
func (c *cache) flushSmallObjects() {
var lastKey []byte
var m []objectInfo
for {
@ -148,7 +148,7 @@ func (c *cache) flushDB() {
}
}
func (c *cache) flushBigObjects(ctx context.Context) {
func (c *cache) workerFlushBig(ctx context.Context) {
tick := time.NewTicker(defaultFlushInterval * 10)
for {
select {
@ -228,8 +228,8 @@ func (c *cache) flushFSTree(ctx context.Context, ignoreErrors bool) error {
return err
}
// flushWorker writes objects to the main storage.
func (c *cache) flushWorker(_ int) {
// workerFlushSmall writes small objects to the main storage.
func (c *cache) workerFlushSmall() {
defer c.wg.Done()
var obj *object.Object