MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 22:55:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

add deprecated expiry_workers to be ignored (#19289)

Browse Source 
avoids error during upgrades such as
```
API: SYSTEM()
Time: 19:19:22 UTC 03/18/2024
DeploymentID: 24e4b574-b28d-4e94-9bfa-03c363a600c2
Error: Invalid api configuration: found invalid keys (expiry_workers=100 ) for 'api' sub-system, use 'mc admin config reset myminio api' to fix invalid keys (*fmt.wrapError)
      11: internal/logger/logger.go:260:logger.LogIf()
...
```
This commit is contained in:
Harshavardhana 2024-03-18 15:25:32 -07:00 committed by GitHub
parent 741de4cf94
commit d4aac7cd72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/config/api/api.go
View File

@ -171,7 +171,6 @@ type Config struct {
ReplicationPriority string `json:"replication_priority"` ReplicationPriority string `json:"replication_priority"`
ReplicationMaxWorkers int `json:"replication_max_workers"` ReplicationMaxWorkers int `json:"replication_max_workers"`
TransitionWorkers int `json:"transition_workers"` TransitionWorkers int `json:"transition_workers"`
ExpiryWorkers int `json:"expiry_workers"`
StaleUploadsCleanupInterval time.Duration `json:"stale_uploads_cleanup_interval"` StaleUploadsCleanupInterval time.Duration `json:"stale_uploads_cleanup_interval"`
StaleUploadsExpiry time.Duration `json:"stale_uploads_expiry"` StaleUploadsExpiry time.Duration `json:"stale_uploads_expiry"`
DeleteCleanupInterval time.Duration `json:"delete_cleanup_interval"` DeleteCleanupInterval time.Duration `json:"delete_cleanup_interval"`
@ -200,6 +199,7 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
"extend_list_cache_life", "extend_list_cache_life",
apiReplicationWorkers, apiReplicationWorkers,
apiReplicationFailedWorkers, apiReplicationFailedWorkers,
"expiry_workers",
} }
disableODirect := env.Get(EnvAPIDisableODirect, kvs.Get(apiDisableODirect)) == config.EnableOn disableODirect := env.Get(EnvAPIDisableODirect, kvs.Get(apiDisableODirect)) == config.EnableOn

5
internal/config/errors.go
View File

@ -224,11 +224,6 @@ Examples:
"", "",
"MINIO_API_TRANSITION_WORKERS: should be >= GOMAXPROCS/2", "MINIO_API_TRANSITION_WORKERS: should be >= GOMAXPROCS/2",
) )
ErrInvalidExpiryWorkersValue = newErrFn(
"Invalid value for expiry workers",
"",
"MINIO_API_EXPIRY_WORKERS: should be between 1 and 500",
)
ErrInvalidBatchKeyRotationWorkersWait = newErrFn( ErrInvalidBatchKeyRotationWorkersWait = newErrFn(
"Invalid value for batch key rotation workers wait", "Invalid value for batch key rotation workers wait",
"Please input a non-negative duration", "Please input a non-negative duration",