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

cleanly destroy remote files

Browse source
This commit is contained in:
Chris Lu 2019-12-25 16:17:58 -08:00
parent eecad6062a
commit 35393b4a02
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
weed/storage/volume.go
View file

@ -225,6 +225,9 @@ func (v *Volume) ToVolumeInformationMessage() *master_pb.VolumeInformationMessag
} }
func (v *Volume) RemoteStorageNameKey() (storageName, storageKey string) { func (v *Volume) RemoteStorageNameKey() (storageName, storageKey string) {
if v.volumeTierInfo == nil {
return
}
if len(v.volumeTierInfo.GetFiles()) == 0 { if len(v.volumeTierInfo.GetFiles()) == 0 {
return return
} }

6
weed/storage/volume_read_write.go
View file

@ -46,6 +46,12 @@ func (v *Volume) Destroy() (err error) {
err = fmt.Errorf("volume %d is compacting", v.Id) err = fmt.Errorf("volume %d is compacting", v.Id)
return return
} }
storageName, storageKey := v.RemoteStorageNameKey()
if v.HasRemoteFile() && storageName != "" && storageKey != "" {
if backendStorage, found := backend.BackendStorages[storageName]; found {
backendStorage.DeleteFile(storageKey)
}
}
v.Close() v.Close()
os.Remove(v.FileName() + ".dat") os.Remove(v.FileName() + ".dat")
os.Remove(v.FileName() + ".idx") os.Remove(v.FileName() + ".idx")

8
weed/storage/volume_tier.go
View file

@ -66,6 +66,14 @@ func (v *Volume) maybeLoadVolumeTierInfo() bool {
return true return true
} }
func (v *Volume) HasRemoteFile() bool {
if v.DataBackend == nil {
return false
}
_, ok := v.DataBackend.(*backend.DiskFile)
return !ok
}
func (v *Volume) LoadRemoteFile() error { func (v *Volume) LoadRemoteFile() error {
tierFile := v.volumeTierInfo.GetFiles()[0] tierFile := v.volumeTierInfo.GetFiles()[0]
backendStorage := backend.BackendStorages[tierFile.BackendName()] backendStorage := backend.BackendStorages[tierFile.BackendName()]