fix for issue #35

This commit is contained in:
Chris Lu 2013-07-19 20:38:00 -07:00
parent ff1c04c486
commit 123b0cc2df

View file

@ -90,14 +90,18 @@ func (s *Store) findFreeLocation() (ret *DiskLocation) {
} }
return ret return ret
} }
func (s *Store) addVolume(vid VolumeId, replicationType ReplicationType) (err error) { func (s *Store) addVolume(vid VolumeId, replicationType ReplicationType) error {
if s.findVolume(vid) != nil { if s.findVolume(vid) != nil {
return fmt.Errorf("Volume Id %s already exists!", vid) return fmt.Errorf("Volume Id %s already exists!", vid)
} }
if location := s.findFreeLocation(); location != nil { if location := s.findFreeLocation(); location != nil {
log.Println("In dir", location.directory, "adds volume =", vid, ", replicationType =", replicationType) log.Println("In dir", location.directory, "adds volume =", vid, ", replicationType =", replicationType)
location.volumes[vid], err = NewVolume(location.directory, vid, replicationType) if volume, err := NewVolume(location.directory, vid, replicationType); err == nil {
return err location.volumes[vid] = volume
return nil
} else {
return err
}
} }
return fmt.Errorf("No more free space left") return fmt.Errorf("No more free space left")
} }