minor PR feedback refactor

influxdata · May 10, 2016 · 4d30ea1 · 4d30ea1
1 parent a3bf3e2
commit 4d30ea1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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.