MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-09 04:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

extend cluster health to return errors for IAM, and Bucket metadata (#19995)

Browse Source 
Bonus: make API freeze to be opt-in instead of default
This commit is contained in:
Harshavardhana 2024-06-26 00:44:34 -07:00 committed by GitHub
parent f8f9fc77ac
commit 5e7b243bde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/bootstrap-peer-server.go
View File

@ -106,14 +106,17 @@ func (s1 *ServerSystemConfig) Diff(s2 *ServerSystemConfig) error {
} }
var skipEnvs = map[string]struct{}{ var skipEnvs = map[string]struct{}{
"MINIO_OPTS": {}, "MINIO_OPTS": {},
"MINIO_CERT_PASSWD": {}, "MINIO_CERT_PASSWD": {},
"MINIO_SERVER_DEBUG": {}, "MINIO_SERVER_DEBUG": {},
"MINIO_DSYNC_TRACE": {}, "MINIO_DSYNC_TRACE": {},
"MINIO_ROOT_USER": {}, "MINIO_ROOT_USER": {},
"MINIO_ROOT_PASSWORD": {}, "MINIO_ROOT_PASSWORD": {},
"MINIO_ACCESS_KEY": {}, "MINIO_ACCESS_KEY": {},
"MINIO_SECRET_KEY": {}, "MINIO_SECRET_KEY": {},
"MINIO_OPERATOR_VERSION": {},
"MINIO_VSPHERE_PLUGIN_VERSION": {},
"MINIO_CI_CD": {},
} }
func getServerSystemCfg() *ServerSystemConfig { func getServerSystemCfg() *ServerSystemConfig {

2
cmd/common-main.go
View File

@ -834,7 +834,7 @@ func serverHandleEnvVars() {
} }
} }
globalDisableFreezeOnBoot = env.Get("_MINIO_DISABLE_API_FREEZE_ON_BOOT", "") == "true" || serverDebugLog globalEnableSyncBoot = env.Get("MINIO_SYNC_BOOT", config.EnableOff) == config.EnableOn
} }
func loadRootCredentials() { func loadRootCredentials() {

4
cmd/globals.go
View File

@ -449,8 +449,8 @@ var (
// dynamic sleeper for multipart expiration routine // dynamic sleeper for multipart expiration routine
deleteMultipartCleanupSleeper = newDynamicSleeper(5, 25*time.Millisecond, false) deleteMultipartCleanupSleeper = newDynamicSleeper(5, 25*time.Millisecond, false)
// Is _MINIO_DISABLE_API_FREEZE_ON_BOOT set? // Is MINIO_SYNC_BOOT set?
globalDisableFreezeOnBoot bool globalEnableSyncBoot bool
// Contains NIC interface name used for internode communication // Contains NIC interface name used for internode communication
globalInternodeInterface string globalInternodeInterface string

33
cmd/healthcheck-handler.go
View File

@ -29,14 +29,35 @@ import (
const unavailable = "offline" const unavailable = "offline"
// ClusterCheckHandler returns if the server is ready for requests. func checkHealth(w http.ResponseWriter) ObjectLayer {
func ClusterCheckHandler(w http.ResponseWriter, r *http.Request) {
ctx := newContext(r, w, "ClusterCheckHandler")
objLayer := newObjectLayerFn() objLayer := newObjectLayerFn()
if objLayer == nil { if objLayer == nil {
w.Header().Set(xhttp.MinIOServerStatus, unavailable) w.Header().Set(xhttp.MinIOServerStatus, unavailable)
writeResponse(w, http.StatusServiceUnavailable, nil, mimeNone) writeResponse(w, http.StatusServiceUnavailable, nil, mimeNone)
return nil
}
if !globalBucketMetadataSys.Initialized() {
w.Header().Set(xhttp.MinIOServerStatus, "bucket-metadata-offline")
writeResponse(w, http.StatusServiceUnavailable, nil, mimeNone)
return nil
}
if !globalIAMSys.Initialized() {
w.Header().Set(xhttp.MinIOServerStatus, "iam-offline")
writeResponse(w, http.StatusServiceUnavailable, nil, mimeNone)
return nil
}
return objLayer
}
// ClusterCheckHandler returns if the server is ready for requests.
func ClusterCheckHandler(w http.ResponseWriter, r *http.Request) {
ctx := newContext(r, w, "ClusterCheckHandler")
objLayer := checkHealth(w)
if objLayer == nil {
return return
} }
@ -72,10 +93,8 @@ func ClusterCheckHandler(w http.ResponseWriter, r *http.Request) {
func ClusterReadCheckHandler(w http.ResponseWriter, r *http.Request) { func ClusterReadCheckHandler(w http.ResponseWriter, r *http.Request) {
ctx := newContext(r, w, "ClusterReadCheckHandler") ctx := newContext(r, w, "ClusterReadCheckHandler")
objLayer := newObjectLayerFn() objLayer := checkHealth(w)
if objLayer == nil { if objLayer == nil {
w.Header().Set(xhttp.MinIOServerStatus, unavailable)
writeResponse(w, http.StatusServiceUnavailable, nil, mimeNone)
return return
} }

7
cmd/server-main.go
View File

@ -897,7 +897,7 @@ func serverMain(ctx *cli.Context) {
}) })
} }
if !globalDisableFreezeOnBoot { if globalEnableSyncBoot {
// Freeze the services until the bucket notification subsystem gets initialized. // Freeze the services until the bucket notification subsystem gets initialized.
bootstrapTrace("freezeServices", freezeServices) bootstrapTrace("freezeServices", freezeServices)
} }
@ -1000,10 +1000,11 @@ func serverMain(ctx *cli.Context) {
}() }()
go func() { go func() {
if !globalDisableFreezeOnBoot { if globalEnableSyncBoot {
defer bootstrapTrace("unfreezeServices", unfreezeServices) defer bootstrapTrace("unfreezeServices", unfreezeServices)
t := time.AfterFunc(5*time.Minute, func() { t := time.AfterFunc(5*time.Minute, func() {
warnings = append(warnings, color.YellowBold("- Initializing the config subsystem is taking longer than 5 minutes. Please set '_MINIO_DISABLE_API_FREEZE_ON_BOOT=true' to not freeze the APIs")) warnings = append(warnings,
color.YellowBold("- Initializing the config subsystem is taking longer than 5 minutes. Please remove 'MINIO_SYNC_BOOT=on' to not freeze the APIs"))
}) })
defer t.Stop() defer t.Stop()
} }