close objects without swallowing errors

pull/10050/head
Jacob Marble 2018-07-06 13:45:22 -07:00
parent 0af22b5992
commit 2ac811e57e
1 changed files with 10 additions and 3 deletions

View File

@ -288,7 +288,7 @@ func (p *Partition) deleteNonManifestFiles(m *Manifest) error {
}
}
return nil
return dir.Close()
}
func (p *Partition) buildSeriesSet() error {
@ -336,13 +336,17 @@ func (p *Partition) Close() error {
p.mu.Lock()
defer p.mu.Unlock()
var err error
// Close log files.
for _, f := range p.fileSet.files {
f.Close()
if localErr := f.Close(); localErr != nil {
err = localErr
}
}
p.fileSet.files = nil
return nil
return err
}
// closing returns true if the partition is currently closing. It does not require
@ -606,6 +610,9 @@ func (p *Partition) DropMeasurement(name []byte) error {
return err
}
}
if err = itr.Close(); err != nil {
return err
}
}
// Mark measurement as deleted.