MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 07:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix error checks when cache is offline/missing. (#5850)

Browse Source
This commit is contained in:
poornas 2018-04-25 22:09:05 -07:00 committed by Nitish Tiwari
parent 9aace6d36d
commit 0dc3d7ac18
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/disk-cache.go
View File

@ -289,12 +289,20 @@ func listDirCacheFactory(isLeaf isLeafFunc, treeWalkIgnoredErrs []error, disks [
listCacheDirs := func(bucket, prefixDir, prefixEntry string) (dirs []string, err error) { listCacheDirs := func(bucket, prefixDir, prefixEntry string) (dirs []string, err error) {
var entries []string var entries []string
for _, disk := range disks { for _, disk := range disks {
// ignore disk-caches that might be missing/offline
if disk == nil {
continue
}
fs := disk.FSObjects fs := disk.FSObjects
entries, err = readDir(pathJoin(fs.fsPath, bucket, prefixDir)) entries, err = readDir(pathJoin(fs.fsPath, bucket, prefixDir))
// For any reason disk was deleted or goes offline, continue
// and list from other disks if possible.
if err != nil { if err != nil {
// For any reason disk was deleted or goes offline, continue if IsErrIgnored(err, treeWalkIgnoredErrs...) {
// and list from other disks if possible. continue
continue }
return nil, err
} }
// Filter entries that have the prefix prefixEntry. // Filter entries that have the prefix prefixEntry.
@ -377,16 +385,16 @@ func (c cacheObjects) listCacheObjects(ctx context.Context, bucket, prefix, mark
var err error var err error
fs, err := c.cache.getCacheFS(ctx, bucket, entry) fs, err := c.cache.getCacheFS(ctx, bucket, entry)
if err != nil { if err != nil {
// Ignore errFileNotFound // Ignore errDiskNotFound
if err == errFileNotFound { if err == errDiskNotFound {
continue continue
} }
return result, toObjectErr(err, bucket, prefix) return result, toObjectErr(err, bucket, prefix)
} }
objInfo, err = fs.getObjectInfo(ctx, bucket, entry) objInfo, err = fs.getObjectInfo(ctx, bucket, entry)
if err != nil { if err != nil {
// Ignore errFileNotFound // Ignore ObjectNotFound error
if err == errFileNotFound { if _, ok := err.(ObjectNotFound); ok {
continue continue
} }
return result, toObjectErr(err, bucket, prefix) return result, toObjectErr(err, bucket, prefix)
@ -469,6 +477,10 @@ func (c cacheObjects) ListObjectsV2(ctx context.Context, bucket, prefix, continu
func (c cacheObjects) listBuckets(ctx context.Context) (buckets []BucketInfo, err error) { func (c cacheObjects) listBuckets(ctx context.Context) (buckets []BucketInfo, err error) {
m := make(map[string]string) m := make(map[string]string)
for _, cache := range c.cache.cfs { for _, cache := range c.cache.cfs {
// ignore disk-caches that might be missing/offline
if cache == nil {
continue
}
entries, err := cache.ListBuckets(ctx) entries, err := cache.ListBuckets(ctx)
if err != nil { if err != nil {
@ -507,6 +519,10 @@ func (c cacheObjects) GetBucketInfo(ctx context.Context, bucket string) (bucketI
bucketInfo, err = getBucketInfoFn(ctx, bucket) bucketInfo, err = getBucketInfoFn(ctx, bucket)
if backendDownError(err) { if backendDownError(err) {
for _, cache := range c.cache.cfs { for _, cache := range c.cache.cfs {
// ignore disk-caches that might be missing/offline
if cache == nil {
continue
}
if bucketInfo, err = cache.GetBucketInfo(ctx, bucket); err == nil { if bucketInfo, err = cache.GetBucketInfo(ctx, bucket); err == nil {
return return
} }
@ -772,6 +788,10 @@ func (c cacheObjects) DeleteBucket(ctx context.Context, bucket string) (err erro
deleteBucketFn := c.DeleteBucketFn deleteBucketFn := c.DeleteBucketFn
var toDel []*cacheFSObjects var toDel []*cacheFSObjects
for _, cfs := range c.cache.cfs { for _, cfs := range c.cache.cfs {
// ignore disk-caches that might be missing/offline
if cfs == nil {
continue
}
if _, cerr := cfs.GetBucketInfo(ctx, bucket); cerr == nil { if _, cerr := cfs.GetBucketInfo(ctx, bucket); cerr == nil {
toDel = append(toDel, cfs) toDel = append(toDel, cfs)
} }