gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid load volume file with BytesOffset mismatch (#3841)

Browse Source 
* avoid load volume file with BytesOffset mismatch

https://github.com/seaweedfs/seaweedfs/issues/2966

* set BytesOffset if has not VolumeInfoFile

* typos fail => failed

* exit if bytesOffset mismatch
This commit is contained in:
Konstantin Lebedev
2022-10-14 12:18:09 +05:00
committed by GitHub
parent f19c9e3d9d
commit 2f72103c83
9 changed files with 291 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/server/volume_grpc_tier_download.go
View File

@@ -69,13 +69,13 @@ func (vs *VolumeServer) VolumeTierMoveDatFromRemote(req *volume_server_pb.Volume
// remove remote file
if err := backendStorage.DeleteFile(storageKey); err != nil {
return fmt.Errorf("volume %d fail to delete remote file %s: %v", v.Id, storageKey, err)
return fmt.Errorf("volume %d failed to delete remote file %s: %v", v.Id, storageKey, err)
}
// forget remote file
v.GetVolumeInfo().Files = v.GetVolumeInfo().Files[1:]
if err := v.SaveVolumeInfo(); err != nil {
return fmt.Errorf("volume %d fail to save remote file info: %v", v.Id, err)
return fmt.Errorf("volume %d failed to save remote file info: %v", v.Id, err)
}
v.DataBackend.Close()

4
weed/server/volume_grpc_tier_upload.go
View File

@@ -80,11 +80,11 @@ func (vs *VolumeServer) VolumeTierMoveDatToRemote(req *volume_server_pb.VolumeTi
})
if err := v.SaveVolumeInfo(); err != nil {
return fmt.Errorf("volume %d fail to save remote file info: %v", v.Id, err)
return fmt.Errorf("volume %d failed to save remote file info: %v", v.Id, err)
}
if err := v.LoadRemoteFile(); err != nil {
return fmt.Errorf("volume %d fail to load remote file: %v", v.Id, err)
return fmt.Errorf("volume %d failed to load remote file: %v", v.Id, err)
}
if !req.KeepLocalDatFile {