From c3a5c1d891f2ed628605e2fe74d640c76f358b37 Mon Sep 17 00:00:00 2001
From: Krasi Georgiev <kgeorgie@redhat.com>
Date: Mon, 11 Feb 2019 12:22:11 +0200
Subject: [PATCH] refactor error handling

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
---
 compact.go | 11 ++++++-----
 db.go      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compact.go b/compact.go
index 8a20dd1c6..81a8355ac 100644
--- a/compact.go
+++ b/compact.go
@@ -490,10 +490,8 @@ func (c *LeveledCompactor) write(dest string, meta *BlockMeta, blocks ...BlockRe
 	defer func(t time.Time) {
 		var merr MultiError
 		merr.Add(err)
+		merr.Add(closeAll(closers))
 		err = merr.Err()
-		for _, w := range closers {
-			merr.Add(w.Close())
-		}
 
 		// RemoveAll returns no error when tmp doesn't exist so it is safe to always run it.
 		if err := os.RemoveAll(tmp); err != nil {
@@ -606,7 +604,7 @@ func (c *LeveledCompactor) write(dest string, meta *BlockMeta, blocks ...BlockRe
 
 // populateBlock fills the index and chunk writers with new data gathered as the union
 // of the provided blocks. It returns meta information for the new block.
-func (c *LeveledCompactor) populateBlock(blocks []BlockReader, meta *BlockMeta, indexw IndexWriter, chunkw ChunkWriter) error {
+func (c *LeveledCompactor) populateBlock(blocks []BlockReader, meta *BlockMeta, indexw IndexWriter, chunkw ChunkWriter) (err error) {
 	if len(blocks) == 0 {
 		return errors.New("cannot populate block from no readers")
 	}
@@ -617,7 +615,10 @@ func (c *LeveledCompactor) populateBlock(blocks []BlockReader, meta *BlockMeta,
 		closers    = []io.Closer{}
 	)
 	defer func() {
-		closeAll(closers...)
+		var merr MultiError
+		merr.Add(err)
+		merr.Add(closeAll(closers))
+		err = merr.Err()
 		c.metrics.populatingBlocks.Set(0)
 	}()
 
diff --git a/db.go b/db.go
index 8bec75447..b4ea426d3 100644
--- a/db.go
+++ b/db.go
@@ -1091,7 +1091,7 @@ func (es MultiError) Err() error {
 	return es
 }
 
-func closeAll(cs ...io.Closer) error {
+func closeAll(cs []io.Closer) error {
 	var merr MultiError
 
 	for _, c := range cs {