MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-13 16:03:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: add env to choose which node to start decom (#19310)

Browse Source 
add a temporary env  _MINIO_DECOM_ENDPOINT to choose 
the node to start decom from, in situations when first node
first pool is not available.
This commit is contained in:
jiuker 2024-03-28 07:18:40 +08:00 committed by GitHub
parent 3d4fc28ec9
commit 4a02189ba0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cmd/admin-handlers-pools.go
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015-2021 MinIO, Inc. // Copyright (c) 2015-2024 MinIO, Inc.
// //
// This file is part of MinIO Object Storage stack // This file is part of MinIO Object Storage stack
// //
@ -18,6 +18,7 @@
package cmd package cmd
import ( import (
"context"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
@ -27,6 +28,7 @@ import (
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/mux" "github.com/minio/mux"
"github.com/minio/pkg/v2/env"
"github.com/minio/pkg/v2/policy" "github.com/minio/pkg/v2/policy"
) )
@ -106,21 +108,12 @@ func (a adminAPIHandlers) StartDecommission(w http.ResponseWriter, r *http.Reque
poolIndices = append(poolIndices, idx) poolIndices = append(poolIndices, idx)
} }
if len(poolIndices) > 0 && !globalEndpoints[poolIndices[0]].Endpoints[0].IsLocal { if len(poolIndices) == 0 || !proxyDecommissionRequest(ctx, globalEndpoints[poolIndices[0]].Endpoints[0], w, r) {
ep := globalEndpoints[poolIndices[0]].Endpoints[0] if err := z.Decommission(r.Context(), poolIndices...); err != nil {
for nodeIdx, proxyEp := range globalProxyEndpoints { writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
if proxyEp.Endpoint.Host == ep.Host { return
if proxyRequestByNodeIndex(ctx, w, r, nodeIdx) {
return
}
}
} }
} }
if err := z.Decommission(r.Context(), poolIndices...); err != nil {
writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
return
}
} }
func (a adminAPIHandlers) CancelDecommission(w http.ResponseWriter, r *http.Request) { func (a adminAPIHandlers) CancelDecommission(w http.ResponseWriter, r *http.Request) {
@ -162,20 +155,12 @@ func (a adminAPIHandlers) CancelDecommission(w http.ResponseWriter, r *http.Requ
return return
} }
if ep := globalEndpoints[idx].Endpoints[0]; !ep.IsLocal { if !proxyDecommissionRequest(ctx, globalEndpoints[idx].Endpoints[0], w, r) {
for nodeIdx, proxyEp := range globalProxyEndpoints { if err := pools.DecommissionCancel(ctx, idx); err != nil {
if proxyEp.Endpoint.Host == ep.Host { writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
if proxyRequestByNodeIndex(ctx, w, r, nodeIdx) { return
return
}
}
} }
} }
if err := pools.DecommissionCancel(ctx, idx); err != nil {
writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
return
}
} }
func (a adminAPIHandlers) StatusPool(w http.ResponseWriter, r *http.Request) { func (a adminAPIHandlers) StatusPool(w http.ResponseWriter, r *http.Request) {
@ -391,3 +376,18 @@ func (a adminAPIHandlers) RebalanceStop(w http.ResponseWriter, r *http.Request)
writeSuccessResponseHeadersOnly(w) writeSuccessResponseHeadersOnly(w)
logger.LogIf(ctx, pools.saveRebalanceStats(GlobalContext, 0, rebalSaveStoppedAt)) logger.LogIf(ctx, pools.saveRebalanceStats(GlobalContext, 0, rebalSaveStoppedAt))
} }
func proxyDecommissionRequest(ctx context.Context, defaultEndPoint Endpoint, w http.ResponseWriter, r *http.Request) (proxy bool) {
host := env.Get("_MINIO_DECOM_ENDPOINT_HOST", defaultEndPoint.Host)
if host == "" {
return
}
for nodeIdx, proxyEp := range globalProxyEndpoints {
if proxyEp.Endpoint.Host == host && !proxyEp.IsLocal {
if proxyRequestByNodeIndex(ctx, w, r, nodeIdx) {
return true
}
}
}
return
}