From 4d30ea1eb35f425cccadd3bc6e1a5b8215573241 Mon Sep 17 00:00:00 2001 From: Cory LaNou Date: Mon, 2 May 2016 12:47:31 -0500 Subject: [PATCH] minor PR feedback refactor --- tsdb/engine/tsm1/engine.go | 5 +---- tsdb/shard.go | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go index f53188ec1f..0685903db7 100644 --- a/tsdb/engine/tsm1/engine.go +++ b/tsdb/engine/tsm1/engine.go @@ -370,11 +370,8 @@ func (e *Engine) readFileFromBackup(tr *tar.Reader, shardRelativePath string) er // Sync to disk & close. if err := f.Sync(); err != nil { return err - } else if err := f.Close(); err != nil { - return err } - - return nil + return f.Close() } // addToIndexFromKey will pull the measurement name, series key, and field name from a composite key and add it to the diff --git a/tsdb/shard.go b/tsdb/shard.go index 0ef37ec470..308613e1c1 100644 --- a/tsdb/shard.go +++ b/tsdb/shard.go @@ -558,11 +558,7 @@ func (s *Shard) Restore(r io.Reader, basePath string) error { } // Reopen engine. - if err := s.Open(); err != nil { - return err - } - - return nil + return s.Open() } // Shards represents a sortable list of shards.