From 321002e4ec21608fd4e8c9fe5c7889d7d5256596 Mon Sep 17 00:00:00 2001
From: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Date: Mon, 24 Jun 2019 12:31:24 +0300
Subject: [PATCH] nits

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
---
 block.go      | 8 +++-----
 tombstones.go | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/block.go b/block.go
index 5940bbb0..7ee96dc5 100644
--- a/block.go
+++ b/block.go
@@ -240,8 +240,7 @@ func writeMetaFile(logger log.Logger, dir string, meta *BlockMeta) error {
 
 	// The meta file is within a block so
 	// its size needs to be calcualted and set upfront.
-	err := setMetaFileSize(meta)
-	if err != nil {
+	if err := setMetaFileSize(meta); err != nil {
 		return err
 	}
 
@@ -265,8 +264,7 @@ func writeMetaFile(logger log.Logger, dir string, meta *BlockMeta) error {
 	}
 
 	var merr tsdb_errors.MultiError
-	_, err = f.Write(jsonMeta)
-	if err != nil {
+	if _, err = f.Write(jsonMeta); err != nil {
 		merr.Add(err)
 		merr.Add(f.Close())
 		return merr.Err()
@@ -275,6 +273,7 @@ func writeMetaFile(logger log.Logger, dir string, meta *BlockMeta) error {
 	// Force the kernel to persist the file on disk to avoid data loss if the host crashes.
 	if err := f.Sync(); err != nil {
 		merr.Add(err)
+		merr.Add(f.Close())
 		return merr.Err()
 	}
 	if err := f.Close(); err != nil {
@@ -285,7 +284,6 @@ func writeMetaFile(logger log.Logger, dir string, meta *BlockMeta) error {
 
 // setMetaFileSize calculates and set the meta file size.
 func setMetaFileSize(meta *BlockMeta) error {
-
 	jsonMeta, err := json.MarshalIndent(meta, "", "\t")
 	if err != nil {
 		return err
diff --git a/tombstones.go b/tombstones.go
index e553bb27..4a2ea328 100644
--- a/tombstones.go
+++ b/tombstones.go
@@ -104,7 +104,7 @@ func writeTombstoneFile(logger log.Logger, dir string, tr TombstoneReader) (int6
 		}
 		return nil
 	}); err != nil {
-		return int64(n), fmt.Errorf("error writing tombstones: %v", err)
+		return 0, fmt.Errorf("error writing tombstones: %v", err)
 	}
 
 	n, err = f.Write(hash.Sum(nil))