mirror of
https://github.com/minio/minio.git
synced 2025-04-23 03:45:49 -04:00
unused code: Remove LoadCredentials function (#7369)
It is required to set the environment variable in the case of distributed minio. LoadCredentials is used to notify peers of the change and will not work if environment variable is set. so, this function will never be called.
This commit is contained in:
parent
8af45f0135
commit
87cf51d5ab
@ -1480,14 +1480,6 @@ func (a adminAPIHandlers) UpdateAdminCredentialsHandler(w http.ResponseWriter,
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify all other Minio peers to update credentials
|
|
||||||
for _, nerr := range globalNotificationSys.LoadCredentials() {
|
|
||||||
if nerr.Err != nil {
|
|
||||||
logger.GetReqInfo(ctx).SetTags("peerAddress", nerr.Host.String())
|
|
||||||
logger.LogIf(ctx, nerr.Err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reply to the client before restarting minio server.
|
// Reply to the client before restarting minio server.
|
||||||
writeSuccessResponseHeadersOnly(w)
|
writeSuccessResponseHeadersOnly(w)
|
||||||
}
|
}
|
||||||
|
@ -169,19 +169,6 @@ func (sys *NotificationSys) LoadUsers() []NotificationPeerErr {
|
|||||||
return ng.Wait()
|
return ng.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
// LoadCredentials - calls LoadCredentials RPC call on all peers.
|
|
||||||
func (sys *NotificationSys) LoadCredentials() []NotificationPeerErr {
|
|
||||||
ng := WithNPeers(len(sys.peerClients))
|
|
||||||
for idx, client := range sys.peerClients {
|
|
||||||
if client == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
client := client
|
|
||||||
ng.Go(context.Background(), client.LoadCredentials, idx, *client.host)
|
|
||||||
}
|
|
||||||
return ng.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartProfiling - start profiling on remote peers, by initiating a remote RPC.
|
// StartProfiling - start profiling on remote peers, by initiating a remote RPC.
|
||||||
func (sys *NotificationSys) StartProfiling(profiler string) []NotificationPeerErr {
|
func (sys *NotificationSys) StartProfiling(profiler string) []NotificationPeerErr {
|
||||||
ng := WithNPeers(len(sys.peerClients))
|
ng := WithNPeers(len(sys.peerClients))
|
||||||
|
@ -347,16 +347,6 @@ func (client *peerRESTClient) LoadUsers() (err error) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// LoadCredentials - send load credentials command to peer nodes.
|
|
||||||
func (client *peerRESTClient) LoadCredentials() (err error) {
|
|
||||||
respBody, err := client.call(peerRESTMethodLoadCredentials, nil, nil, -1)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer http.DrainBody(respBody)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SignalService - sends signal to peer nodes.
|
// SignalService - sends signal to peer nodes.
|
||||||
func (client *peerRESTClient) SignalService(sig serviceSignal) error {
|
func (client *peerRESTClient) SignalService(sig serviceSignal) error {
|
||||||
values := make(url.Values)
|
values := make(url.Values)
|
||||||
|
@ -31,7 +31,6 @@ const (
|
|||||||
peerRESTMethodLoadUsers = "loadusers"
|
peerRESTMethodLoadUsers = "loadusers"
|
||||||
peerRESTMethodStartProfiling = "startprofiling"
|
peerRESTMethodStartProfiling = "startprofiling"
|
||||||
peerRESTMethodDownloadProfilingData = "downloadprofilingdata"
|
peerRESTMethodDownloadProfilingData = "downloadprofilingdata"
|
||||||
peerRESTMethodLoadCredentials = "loadcredentials"
|
|
||||||
peerRESTMethodBucketPolicySet = "setbucketpolicy"
|
peerRESTMethodBucketPolicySet = "setbucketpolicy"
|
||||||
peerRESTMethodBucketNotificationPut = "putbucketnotification"
|
peerRESTMethodBucketNotificationPut = "putbucketnotification"
|
||||||
peerRESTMethodBucketNotificationListen = "listenbucketnotification"
|
peerRESTMethodBucketNotificationListen = "listenbucketnotification"
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@ -244,34 +243,6 @@ func (s *peerRESTServer) MemUsageInfoHandler(w http.ResponseWriter, r *http.Requ
|
|||||||
logger.LogIf(ctx, gob.NewEncoder(w).Encode(info))
|
logger.LogIf(ctx, gob.NewEncoder(w).Encode(info))
|
||||||
}
|
}
|
||||||
|
|
||||||
// LoadCredentialsHandler - loads credentials.
|
|
||||||
func (s *peerRESTServer) LoadCredentialsHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if !s.IsValid(w, r) {
|
|
||||||
s.writeErrorResponse(w, errors.New("Invalid request"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Construct path to config.json for the given bucket.
|
|
||||||
configFile := path.Join(bucketConfigPrefix, minioConfigFile)
|
|
||||||
transactionConfigFile := configFile + ".transaction"
|
|
||||||
|
|
||||||
// As object layer's GetObject() and PutObject() take respective lock on minioMetaBucket
|
|
||||||
// and configFile, take a transaction lock to avoid race.
|
|
||||||
objLock := globalNSMutex.NewNSLock(minioMetaBucket, transactionConfigFile)
|
|
||||||
if err := objLock.GetRLock(globalOperationTimeout); err != nil {
|
|
||||||
s.writeErrorResponse(w, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
objLock.RUnlock()
|
|
||||||
|
|
||||||
if err := globalConfigSys.Load(newObjectLayerFn()); err != nil {
|
|
||||||
s.writeErrorResponse(w, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.(http.Flusher).Flush()
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteBucketHandler - Delete notification and policies related to the bucket.
|
// DeleteBucketHandler - Delete notification and policies related to the bucket.
|
||||||
func (s *peerRESTServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Request) {
|
func (s *peerRESTServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
if !s.IsValid(w, r) {
|
if !s.IsValid(w, r) {
|
||||||
@ -609,7 +580,6 @@ func registerPeerRESTHandlers(router *mux.Router) {
|
|||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodStartProfiling).HandlerFunc(httpTraceAll(server.StartProfilingHandler)).Queries(restQueries(peerRESTProfiler)...)
|
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodStartProfiling).HandlerFunc(httpTraceAll(server.StartProfilingHandler)).Queries(restQueries(peerRESTProfiler)...)
|
||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodDownloadProfilingData).HandlerFunc(httpTraceHdrs(server.DownloadProflingDataHandler))
|
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodDownloadProfilingData).HandlerFunc(httpTraceHdrs(server.DownloadProflingDataHandler))
|
||||||
|
|
||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodLoadCredentials).HandlerFunc(httpTraceHdrs(server.LoadCredentialsHandler))
|
|
||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodTargetExists).HandlerFunc(httpTraceHdrs(server.TargetExistsHandler)).Queries(restQueries(peerRESTBucket)...)
|
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodTargetExists).HandlerFunc(httpTraceHdrs(server.TargetExistsHandler)).Queries(restQueries(peerRESTBucket)...)
|
||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodSendEvent).HandlerFunc(httpTraceHdrs(server.SendEventHandler)).Queries(restQueries(peerRESTBucket)...)
|
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodSendEvent).HandlerFunc(httpTraceHdrs(server.SendEventHandler)).Queries(restQueries(peerRESTBucket)...)
|
||||||
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodBucketNotificationPut).HandlerFunc(httpTraceHdrs(server.PutBucketNotificationHandler)).Queries(restQueries(peerRESTBucket)...)
|
subrouter.Methods(http.MethodPost).Path("/" + peerRESTMethodBucketNotificationPut).HandlerFunc(httpTraceHdrs(server.PutBucketNotificationHandler)).Queries(restQueries(peerRESTBucket)...)
|
||||||
|
@ -764,20 +764,11 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
|
|||||||
return toJSONError(err)
|
return toJSONError(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if errs := globalNotificationSys.LoadCredentials(); len(errs) != 0 {
|
reply.Token, err = authenticateWeb(creds.AccessKey, creds.SecretKey)
|
||||||
reply.PeerErrMsgs = make(map[string]string)
|
if err != nil {
|
||||||
for _, nerr := range errs {
|
return toJSONError(err)
|
||||||
err = fmt.Errorf("Unable to update credentials on server %v: %v", nerr.Host, nerr.Err)
|
|
||||||
logger.LogIf(context.Background(), err)
|
|
||||||
reply.PeerErrMsgs[nerr.Host.String()] = err.Error()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
reply.Token, err = authenticateWeb(creds.AccessKey, creds.SecretKey)
|
|
||||||
if err != nil {
|
|
||||||
return toJSONError(err)
|
|
||||||
}
|
|
||||||
reply.UIVersion = browser.UIVersion
|
|
||||||
}
|
}
|
||||||
|
reply.UIVersion = browser.UIVersion
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user