mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-06-02 16:50:25 +02:00
Code Issues Projects Releases Wiki Activity

adjust error names

Browse source
This commit is contained in:
Chris Lu 2019-01-05 19:52:38 -08:00
parent 9383c91eb1
commit 6b5d6bb5a6
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/operation/delete_content.go
View file

@ -131,7 +131,7 @@ func DeleteFilesAtOneVolumeServer(volumeServer string, fileIds []string) (ret []
} }
for _, result := range ret { for _, result := range ret {
if result.Error != "" && result.Error != "Not Found" { if result.Error != "" && result.Error != "not found" {
return nil, fmt.Errorf("delete fileId %s: %v", result.FileId, result.Error) return nil, fmt.Errorf("delete fileId %s: %v", result.FileId, result.Error)
} }
} }

8
weed/operation/lookup_vid_cache.go
View file

@ -9,6 +9,8 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
) )
var ErrorNotFound = errors.New("not found")
type VidInfo struct { type VidInfo struct {
Locations []Location Locations []Location
NextRefreshTime time.Time NextRefreshTime time.Time
@ -28,14 +30,14 @@ func (vc *VidCache) Get(vid string) ([]Location, error) {
defer vc.RUnlock() defer vc.RUnlock()
if 0 < id && id <= len(vc.cache) { if 0 < id && id <= len(vc.cache) {
if vc.cache[id-1].Locations == nil { if vc.cache[id-1].Locations == nil {
return nil, errors.New("Not Set") return nil, errors.New("not set")
} }
if vc.cache[id-1].NextRefreshTime.Before(time.Now()) { if vc.cache[id-1].NextRefreshTime.Before(time.Now()) {
return nil, errors.New("Expired") return nil, errors.New("expired")
} }
return vc.cache[id-1].Locations, nil return vc.cache[id-1].Locations, nil
} }
return nil, errors.New("Not Found") return nil, ErrorNotFound
} }
func (vc *VidCache) Set(vid string, locations []Location, duration time.Duration) { func (vc *VidCache) Set(vid string, locations []Location, duration time.Duration) {
id, err := strconv.Atoi(vid) id, err := strconv.Atoi(vid)

4
weed/storage/volume_read_write.go
View file

@ -143,7 +143,7 @@ func (v *Volume) readNeedle(n *Needle) (int, error) {
} }
} }
if nv.Size == TombstoneFileSize { if nv.Size == TombstoneFileSize {
return -1, errors.New("Already Deleted") return -1, errors.New("already deleted")
} }
err := n.ReadData(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version()) err := n.ReadData(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version())
if err != nil { if err != nil {
@ -163,7 +163,7 @@ func (v *Volume) readNeedle(n *Needle) (int, error) {
if uint64(time.Now().Unix()) < n.LastModified+uint64(ttlMinutes*60) { if uint64(time.Now().Unix()) < n.LastModified+uint64(ttlMinutes*60) {
return bytesRead, nil return bytesRead, nil
} }
return -1, errors.New("Not Found") return -1, ErrorNotFound
} }
func ScanVolumeFile(dirname string, collection string, id VolumeId, func ScanVolumeFile(dirname string, collection string, id VolumeId,