MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-23 11:55:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate caching for erasure/distributed mode (#13909)

Browse Source 
Fixes: #13907

Also removing default value of `writethrough` for cache commit
which was interfering with cache_after setting
This commit is contained in:
Poorna K 2021-12-15 16:48:34 -08:00 committed by GitHub
parent 91f72f25ab
commit 111c6177d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/disk-cache.go
View File

@ -706,7 +706,7 @@ func (c *cacheObjects) PutObject(ctx context.Context, bucket, object string, r *
oi, _, err := dcache.Stat(GlobalContext, bucket, object) oi, _, err := dcache.Stat(GlobalContext, bucket, object)
// avoid cache overwrite if another background routine filled cache // avoid cache overwrite if another background routine filled cache
if err != nil || oi.ETag != bReader.ObjInfo.ETag { if err != nil || oi.ETag != bReader.ObjInfo.ETag {
dcache.Put(GlobalContext, bucket, object, bReader, bReader.ObjInfo.Size, nil, ObjectOptions{UserDefined: getMetadata(bReader.ObjInfo)}, false, true) dcache.Put(GlobalContext, bucket, object, bReader, bReader.ObjInfo.Size, nil, ObjectOptions{UserDefined: getMetadata(bReader.ObjInfo)}, false, false)
} }
}() }()
} }

3
cmd/server-main.go
View File

@ -591,8 +591,9 @@ func serverMain(ctx *cli.Context) {
} }
} }
// initialize the new disk cache objects.
if globalCacheConfig.Enabled { if globalCacheConfig.Enabled {
// initialize the new disk cache objects. logStartupMessage(color.Yellow("WARNING: Disk caching is deprecated for single/multi drive MinIO setups. Please migrate to using MinIO S3 gateway instead of disk caching"))
var cacheAPI CacheObjectLayer var cacheAPI CacheObjectLayer
cacheAPI, err = newServerCacheObjects(GlobalContext, globalCacheConfig) cacheAPI, err = newServerCacheObjects(GlobalContext, globalCacheConfig)
logger.FatalIf(err, "Unable to initialize disk caching") logger.FatalIf(err, "Unable to initialize disk caching")

3
internal/config/cache/lookup.go vendored
View File

@ -56,7 +56,6 @@ const (
DefaultAfter = "0" DefaultAfter = "0"
DefaultWaterMarkLow = "70" DefaultWaterMarkLow = "70"
DefaultWaterMarkHigh = "80" DefaultWaterMarkHigh = "80"
DefaultCacheCommit = WriteThrough
) )
// DefaultKVS - default KV settings for caching. // DefaultKVS - default KV settings for caching.
@ -96,7 +95,7 @@ var (
}, },
config.KV{ config.KV{
Key: Commit, Key: Commit,
Value: DefaultCacheCommit, Value: "",
}, },
} }
) )