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

Add missing error check (#6632)

Browse Source
This commit is contained in:
Pontus Leitzler 2018-10-17 19:57:12 +02:00 committed by Dee Koder
parent 3457e504cf
commit c998d1ac8c
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/disk-cache.go
View File

@ -183,10 +183,7 @@ func (c cacheObjects) getMetadata(objInfo ObjectInfo) map[string]string {
} }
func (c cacheObjects) GetObjectNInfo(ctx context.Context, bucket, object string, rs *HTTPRangeSpec, h http.Header, lockType LockType, opts ObjectOptions) (gr *GetObjectReader, err error) { func (c cacheObjects) GetObjectNInfo(ctx context.Context, bucket, object string, rs *HTTPRangeSpec, h http.Header, lockType LockType, opts ObjectOptions) (gr *GetObjectReader, err error) {
if c.isCacheExclude(bucket, object) {
objInfo, bkErr := c.GetObjectInfoFn(ctx, bucket, object, opts)
if c.isCacheExclude(bucket, object) || !objInfo.IsCacheable() {
return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts) return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts)
} }
@ -196,24 +193,24 @@ func (c cacheObjects) GetObjectNInfo(ctx context.Context, bucket, object string,
return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts) return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts)
} }
backendDown := backendDownError(bkErr) cacheReader, cacheErr := dcache.GetObjectNInfo(ctx, bucket, object, rs, h, lockType, opts)
if bkErr != nil && !backendDown {
objInfo, err := c.GetObjectInfoFn(ctx, bucket, object, opts)
if backendDownError(err) && cacheErr == nil {
return cacheReader, nil
} else if err != nil {
if _, ok := err.(ObjectNotFound); ok { if _, ok := err.(ObjectNotFound); ok {
// Delete the cached entry if backend object was deleted. // Delete cached entry if backend object was deleted.
dcache.Delete(ctx, bucket, object) dcache.Delete(ctx, bucket, object)
} }
return nil, bkErr return nil, err
} }
if !backendDown && filterFromCache(objInfo.UserDefined) { if !objInfo.IsCacheable() || filterFromCache(objInfo.UserDefined) {
return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts) return c.GetObjectNInfoFn(ctx, bucket, object, rs, h, writeLock, opts)
} }
if cacheReader, cacheErr := dcache.GetObjectNInfo(ctx, bucket, object, rs, h, lockType, opts); cacheErr == nil { if cacheErr == nil {
if backendDown {
// If the backend is down, serve the request from cache.
return cacheReader, nil
}
if cacheReader.ObjInfo.ETag == objInfo.ETag && !isStaleCache(objInfo) { if cacheReader.ObjInfo.ETag == objInfo.ETag && !isStaleCache(objInfo) {
// Object is not stale, so serve from cache // Object is not stale, so serve from cache
return cacheReader, nil return cacheReader, nil
@ -287,6 +284,10 @@ func (c cacheObjects) GetObject(ctx context.Context, bucket, object string, star
return err return err
} }
if !backendDown && !objInfo.IsCacheable() {
return GetObjectFn(ctx, bucket, object, startOffset, length, writer, etag, opts)
}
if !backendDown && filterFromCache(objInfo.UserDefined) { if !backendDown && filterFromCache(objInfo.UserDefined) {
return GetObjectFn(ctx, bucket, object, startOffset, length, writer, etag, opts) return GetObjectFn(ctx, bucket, object, startOffset, length, writer, etag, opts)
} }