gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

fix bug deleting volume or unmount volume if a volume server has multiple directories

Browse source
This commit is contained in:
chrislu 2022-04-19 22:58:57 -07:00
parent 0a137e675d
commit 8e9ad7db5a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
weed/storage/store.go
View file

@ -434,10 +434,13 @@ func (s *Store) UnmountVolume(i needle.VolumeId) error {
} }
for _, location := range s.Locations { for _, location := range s.Locations {
if err := location.UnloadVolume(i); err == nil || err == ErrVolumeNotFound { err := location.UnloadVolume(i)
if err == nil {
glog.V(0).Infof("UnmountVolume %d", i) glog.V(0).Infof("UnmountVolume %d", i)
s.DeletedVolumesChan <- message s.DeletedVolumesChan <- message
return nil return nil
} else if err == ErrVolumeNotFound {
continue
} }
} }
@ -458,10 +461,13 @@ func (s *Store) DeleteVolume(i needle.VolumeId) error {
DiskType: string(v.location.DiskType), DiskType: string(v.location.DiskType),
} }
for _, location := range s.Locations { for _, location := range s.Locations {
if err := location.DeleteVolume(i); err == nil || err == ErrVolumeNotFound { err := location.DeleteVolume(i)
if err == nil {
glog.V(0).Infof("DeleteVolume %d", i) glog.V(0).Infof("DeleteVolume %d", i)
s.DeletedVolumesChan <- message s.DeletedVolumesChan <- message
return nil return nil
} else if err == ErrVolumeNotFound {
continue
} else { } else {
glog.Errorf("DeleteVolume %d: %v", i, err) glog.Errorf("DeleteVolume %d: %v", i, err)
} }