[#1818] writecache: Reuse FSTree flushing code between flushes

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>

pkg/local_object_storage/writecache/flush.go

@@ -137,7 +137,18 @@ func (c *cache) flushBigObjects() {
 				break
 			}
 
+			_ = c.flushFSTree(true)
+
+			c.modeMtx.RUnlock()
+		case <-c.closeCh:
+			return
+		}
+	}
+}
+
+func (c *cache) flushFSTree(ignoreErrors bool) error {
 	var prm common.IteratePrm
+	prm.IgnoreErrors = ignoreErrors
 	prm.LazyHandler = func(addr oid.Address, f func() ([]byte, error)) error {
 		sAddr := addr.EncodeToString()
 
@@ -147,28 +158,35 @@ func (c *cache) flushBigObjects() {
 
 		data, err := f()
 		if err != nil {
+			if ignoreErrors {
 				c.log.Error("can't read a file", zap.Stringer("address", addr))
 				return nil
 			}
+			return err
+		}
 
-				c.mtx.Lock()
-				_, compress := c.compressFlags[sAddr]
-				c.mtx.Unlock()
+		var obj object.Object
+		err = obj.Unmarshal(data)
+		if err != nil {
+			if ignoreErrors {
+				c.log.Error("can't unmarshal an object", zap.Stringer("address", addr))
+				return nil
+			}
+			return err
+		}
 
 		var prm common.PutPrm
 		prm.Address = addr
+		prm.Object = &obj
 		prm.RawData = data
-				prm.DontCompress = !compress
 
-				if _, err := c.blobstor.Put(prm); err != nil {
+		_, err = c.blobstor.Put(prm)
+		if err != nil {
+			if ignoreErrors {
 				c.log.Error("cant flush object to blobstor", zap.Error(err))
 				return nil
 			}
-
-				if compress {
-					c.mtx.Lock()
-					delete(c.compressFlags, sAddr)
-					c.mtx.Unlock()
+			return err
 		}
 
 		// mark object as flushed
@@ -177,13 +195,8 @@ func (c *cache) flushBigObjects() {
 		return nil
 	}
 
-			_, _ = c.fsTree.Iterate(prm)
-
-			c.modeMtx.RUnlock()
-		case <-c.closeCh:
-			return
-		}
-	}
+	_, err := c.fsTree.Iterate(prm)
+	return err
 }
 
 // flushWorker writes objects to the main storage.
@@ -241,36 +254,7 @@ func (c *cache) Flush(ignoreErrors bool) error {
 }
 
 func (c *cache) flush(ignoreErrors bool) error {
-	var prm common.IteratePrm
-	prm.IgnoreErrors = ignoreErrors
-	prm.LazyHandler = func(addr oid.Address, f func() ([]byte, error)) error {
-		_, ok := c.flushed.Peek(addr.EncodeToString())
-		if ok {
-			return nil
-		}
-
-		data, err := f()
-		if err != nil {
-			if ignoreErrors {
-				return nil
-			}
-			return err
-		}
-
-		var obj object.Object
-		err = obj.Unmarshal(data)
-		if err != nil {
-			if ignoreErrors {
-				return nil
-			}
-			return err
-		}
-
-		return c.flushObject(&obj)
-	}
-
-	_, err := c.fsTree.Iterate(prm)
-	if err != nil {
+	if err := c.flushFSTree(ignoreErrors); err != nil {
 		return err
 	}