mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
volume: deletion checks all disk locations
fix https://github.com/chrislusf/seaweedfs/issues/1283
This commit is contained in:
parent
57df14f76f
commit
bafa95045b
|
@ -167,7 +167,7 @@ func (l *DiskLocation) DeleteCollectionFromDiskLocation(collection string) (e er
|
|||
return
|
||||
}
|
||||
|
||||
func (l *DiskLocation) deleteVolumeById(vid needle.VolumeId) (e error) {
|
||||
func (l *DiskLocation) deleteVolumeById(vid needle.VolumeId) (found bool, e error) {
|
||||
v, ok := l.volumes[vid]
|
||||
if !ok {
|
||||
return
|
||||
|
@ -176,6 +176,7 @@ func (l *DiskLocation) deleteVolumeById(vid needle.VolumeId) (e error) {
|
|||
if e != nil {
|
||||
return
|
||||
}
|
||||
found = true
|
||||
delete(l.volumes, vid)
|
||||
return
|
||||
}
|
||||
|
@ -195,7 +196,8 @@ func (l *DiskLocation) DeleteVolume(vid needle.VolumeId) error {
|
|||
if !ok {
|
||||
return fmt.Errorf("Volume not found, VolumeId: %d", vid)
|
||||
}
|
||||
return l.deleteVolumeById(vid)
|
||||
_, err := l.deleteVolumeById(vid)
|
||||
return err
|
||||
}
|
||||
|
||||
func (l *DiskLocation) UnloadVolume(vid needle.VolumeId) error {
|
||||
|
|
|
@ -221,8 +221,14 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
|
|||
// delete expired volumes.
|
||||
location.volumesLock.Lock()
|
||||
for _, vid := range deleteVids {
|
||||
location.deleteVolumeById(vid)
|
||||
glog.V(0).Infoln("volume", vid, "is deleted.")
|
||||
found, err := location.deleteVolumeById(vid)
|
||||
if found {
|
||||
if err == nil {
|
||||
glog.V(0).Infof("volume %d is deleted", vid)
|
||||
} else {
|
||||
glog.V(0).Infof("delete volume %d: %v", vid, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
location.volumesLock.Unlock()
|
||||
}
|
||||
|
@ -355,7 +361,7 @@ func (s *Store) UnmountVolume(i needle.VolumeId) error {
|
|||
func (s *Store) DeleteVolume(i needle.VolumeId) error {
|
||||
v := s.findVolume(i)
|
||||
if v == nil {
|
||||
return nil
|
||||
return fmt.Errorf("delete volume %d not found on disk", i)
|
||||
}
|
||||
message := master_pb.VolumeShortInformationMessage{
|
||||
Id: uint32(v.Id),
|
||||
|
@ -365,7 +371,7 @@ func (s *Store) DeleteVolume(i needle.VolumeId) error {
|
|||
Ttl: v.Ttl.ToUint32(),
|
||||
}
|
||||
for _, location := range s.Locations {
|
||||
if error := location.deleteVolumeById(i); error == nil {
|
||||
if found, error := location.deleteVolumeById(i); found && error == nil {
|
||||
glog.V(0).Infof("DeleteVolume %d", i)
|
||||
s.DeletedVolumesChan <- message
|
||||
return nil
|
||||
|
|
Loading…
Reference in a new issue