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

Re-load config after 'mc admin config reset' (#15771)

Browse Source
This commit is contained in:
Shireesh Anjal 2022-09-30 23:25:53 +05:30 committed by GitHub
parent c302d1cfc8
commit 45edd27ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/admin-handlers-config-kv.go
View File

@ -81,6 +81,7 @@ func (a adminAPIHandlers) DelConfigKVHandler(w http.ResponseWriter, r *http.Requ
writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL) writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
return return
} }
if err = validateConfig(cfg, subSys); err != nil { if err = validateConfig(cfg, subSys); err != nil {
writeCustomErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminConfigBadJSON), err.Error(), r.URL) writeCustomErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminConfigBadJSON), err.Error(), r.URL)
return return
@ -91,6 +92,12 @@ func (a adminAPIHandlers) DelConfigKVHandler(w http.ResponseWriter, r *http.Requ
return return
} }
// freshly retrieve the config so that default values are loaded for reset config
if cfg, err = getValidConfig(objectAPI); err != nil {
writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
return
}
dynamic := config.SubSystemsDynamic.Contains(subSys) dynamic := config.SubSystemsDynamic.Contains(subSys)
if dynamic { if dynamic {
applyDynamic(ctx, objectAPI, cfg, subSys, r, w) applyDynamic(ctx, objectAPI, cfg, subSys, r, w)
@ -173,6 +180,7 @@ func (a adminAPIHandlers) SetConfigKVHandler(w http.ResponseWriter, r *http.Requ
if dynamic { if dynamic {
applyDynamic(ctx, objectAPI, cfg, subSys, r, w) applyDynamic(ctx, objectAPI, cfg, subSys, r, w)
} }
writeSuccessResponseHeadersOnly(w) writeSuccessResponseHeadersOnly(w)
} }