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

Avoid calling KES Status when peers ping each other (#17140)

Browse Source
This commit is contained in:
Anis Eleuch 2023-05-04 19:28:33 +01:00 committed by GitHub
parent 7f7b489a3d
commit 06cd0a636e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/healthcheck-handler.go
View File

@ -28,7 +28,7 @@ import (
const unavailable = "offline" const unavailable = "offline"
func isServerInitialized() bool { func isServerNotInitialized() bool {
return newObjectLayerFn() == nil return newObjectLayerFn() == nil
} }
@ -36,7 +36,7 @@ func isServerInitialized() bool {
func ClusterCheckHandler(w http.ResponseWriter, r *http.Request) { func ClusterCheckHandler(w http.ResponseWriter, r *http.Request) {
ctx := newContext(r, w, "ClusterCheckHandler") ctx := newContext(r, w, "ClusterCheckHandler")
if isServerInitialized() { if isServerNotInitialized() {
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 return
@ -77,7 +77,7 @@ 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")
if isServerInitialized() { if isServerNotInitialized() {
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 return
@ -104,7 +104,13 @@ func ReadinessCheckHandler(w http.ResponseWriter, r *http.Request) {
// LivenessCheckHandler - Checks if the process is up. Always returns success. // LivenessCheckHandler - Checks if the process is up. Always returns success.
func LivenessCheckHandler(w http.ResponseWriter, r *http.Request) { func LivenessCheckHandler(w http.ResponseWriter, r *http.Request) {
if isServerInitialized() { peerCall := r.Header.Get("x-minio-from-peer") != ""
if peerCall {
return
}
if isServerNotInitialized() {
// Service not initialized yet // Service not initialized yet
w.Header().Set(xhttp.MinIOServerStatus, unavailable) w.Header().Set(xhttp.MinIOServerStatus, unavailable)
} }
@ -121,7 +127,7 @@ func LivenessCheckHandler(w http.ResponseWriter, r *http.Request) {
} }
// Verify if KMS is reachable if its configured // Verify if KMS is reachable if its configured
if GlobalKMS != nil { if GlobalKMS != nil && !peerCall {
ctx, cancel := context.WithTimeout(r.Context(), time.Minute) ctx, cancel := context.WithTimeout(r.Context(), time.Minute)
defer cancel() defer cancel()

5
cmd/prepare-storage.go
View File

@ -125,15 +125,16 @@ func isServerResolvable(endpoint Endpoint, timeout time.Duration) error {
} }
ctx, cancel := context.WithTimeout(GlobalContext, timeout) ctx, cancel := context.WithTimeout(GlobalContext, timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, serverURL.String(), nil) req, err := http.NewRequestWithContext(ctx, http.MethodGet, serverURL.String(), nil)
if err != nil { if err != nil {
cancel()
return err return err
} }
req.Header.Set("x-minio-from-peer", "true")
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)
cancel()
if err != nil { if err != nil {
return err return err
} }