Merge pull request from influxdata/jw-shard-size

Fix panic in shard.DiskSize()
pull/6697/head
Edd Robinson 2016-05-20 15:29:53 +01:00
commit 0b2a806789
1 changed files with 8 additions and 0 deletions

View File

@ -237,6 +237,10 @@ func (s *Shard) closed() bool {
func (s *Shard) DiskSize() (int64, error) {
var size int64
err := filepath.Walk(s.path, func(_ string, fi os.FileInfo, err error) error {
if err != nil {
return err
}
if !fi.IsDir() {
size += fi.Size()
}
@ -247,6 +251,10 @@ func (s *Shard) DiskSize() (int64, error) {
}
err = filepath.Walk(s.walPath, func(_ string, fi os.FileInfo, err error) error {
if err != nil {
return err
}
if !fi.IsDir() {
size += fi.Size()
}