diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-10-14 12:18:09 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 00:18:09 -0700 |
| commit | 2f72103c831f8a5227613436ed87f9464825f995 (patch) | |
| tree | f82dbfe60f1999da257d291b0366c5e796efbb6a /weed/server | |
| parent | f19c9e3d9d83daa9fa48eaeb8b23cc69215bacb5 (diff) | |
| download | seaweedfs-2f72103c831f8a5227613436ed87f9464825f995.tar.xz seaweedfs-2f72103c831f8a5227613436ed87f9464825f995.zip | |
avoid load volume file with BytesOffset mismatch (#3841)
* 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
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_grpc_tier_download.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_grpc_tier_upload.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_tier_download.go b/weed/server/volume_grpc_tier_download.go index a4a3b59ca..e7a93e7bd 100644 --- a/weed/server/volume_grpc_tier_download.go +++ b/weed/server/volume_grpc_tier_download.go @@ -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() diff --git a/weed/server/volume_grpc_tier_upload.go b/weed/server/volume_grpc_tier_upload.go index 9561a9358..914f352ee 100644 --- a/weed/server/volume_grpc_tier_upload.go +++ b/weed/server/volume_grpc_tier_upload.go @@ -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 { |