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

fix: peer addr returned as empty string (#19308)

Browse Source 
In handlers related to health diagnostics e.g. CPU, Network, Partitions,
etc, globalMinioHost was being passed as the addr, resulting in empty
value for the same in the health report.

Using globalLocalNodeName instead fixes the issue.
This commit is contained in:
Shireesh Anjal 2024-03-21 22:49:14 +05:30 committed by GitHub
parent d990661d1f
commit 55778ae278
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/peer-rest-server.go
View File

@ -368,7 +368,7 @@ func (s *peerRESTServer) LocalStorageInfoHandler(mss *grid.MSS) (*grid.JSON[madm
// ServerInfoHandler - returns Server Info // ServerInfoHandler - returns Server Info
func (s *peerRESTServer) ServerInfoHandler(params *grid.MSS) (*grid.JSON[madmin.ServerProperties], *grid.RemoteErr) { func (s *peerRESTServer) ServerInfoHandler(params *grid.MSS) (*grid.JSON[madmin.ServerProperties], *grid.RemoteErr) {
r := http.Request{Host: globalMinioHost} r := http.Request{Host: globalLocalNodeName}
metrics, err := strconv.ParseBool(params.Get(peerRESTMetrics)) metrics, err := strconv.ParseBool(params.Get(peerRESTMetrics))
if err != nil { if err != nil {
return nil, grid.NewRemoteErr(err) return nil, grid.NewRemoteErr(err)
@ -379,37 +379,37 @@ func (s *peerRESTServer) ServerInfoHandler(params *grid.MSS) (*grid.JSON[madmin.
// GetCPUsHandler - returns CPU info. // GetCPUsHandler - returns CPU info.
func (s *peerRESTServer) GetCPUsHandler(_ *grid.MSS) (*grid.JSON[madmin.CPUs], *grid.RemoteErr) { func (s *peerRESTServer) GetCPUsHandler(_ *grid.MSS) (*grid.JSON[madmin.CPUs], *grid.RemoteErr) {
info := madmin.GetCPUs(context.Background(), globalMinioHost) info := madmin.GetCPUs(context.Background(), globalLocalNodeName)
return madminCPUs.NewJSONWith(&info), nil return madminCPUs.NewJSONWith(&info), nil
} }
// GetNetInfoHandler - returns network information. // GetNetInfoHandler - returns network information.
func (s *peerRESTServer) GetNetInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.NetInfo], *grid.RemoteErr) { func (s *peerRESTServer) GetNetInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.NetInfo], *grid.RemoteErr) {
info := madmin.GetNetInfo(globalMinioHost, globalInternodeInterface) info := madmin.GetNetInfo(globalLocalNodeName, globalInternodeInterface)
return madminNetInfo.NewJSONWith(&info), nil return madminNetInfo.NewJSONWith(&info), nil
} }
// GetPartitionsHandler - returns disk partition information. // GetPartitionsHandler - returns disk partition information.
func (s *peerRESTServer) GetPartitionsHandler(_ *grid.MSS) (*grid.JSON[madmin.Partitions], *grid.RemoteErr) { func (s *peerRESTServer) GetPartitionsHandler(_ *grid.MSS) (*grid.JSON[madmin.Partitions], *grid.RemoteErr) {
info := madmin.GetPartitions(context.Background(), globalMinioHost) info := madmin.GetPartitions(context.Background(), globalLocalNodeName)
return madminPartitions.NewJSONWith(&info), nil return madminPartitions.NewJSONWith(&info), nil
} }
// GetOSInfoHandler - returns operating system's information. // GetOSInfoHandler - returns operating system's information.
func (s *peerRESTServer) GetOSInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.OSInfo], *grid.RemoteErr) { func (s *peerRESTServer) GetOSInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.OSInfo], *grid.RemoteErr) {
info := madmin.GetOSInfo(context.Background(), globalMinioHost) info := madmin.GetOSInfo(context.Background(), globalLocalNodeName)
return madminOSInfo.NewJSONWith(&info), nil return madminOSInfo.NewJSONWith(&info), nil
} }
// GetProcInfoHandler - returns this MinIO process information. // GetProcInfoHandler - returns this MinIO process information.
func (s *peerRESTServer) GetProcInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.ProcInfo], *grid.RemoteErr) { func (s *peerRESTServer) GetProcInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.ProcInfo], *grid.RemoteErr) {
info := madmin.GetProcInfo(context.Background(), globalMinioHost) info := madmin.GetProcInfo(context.Background(), globalLocalNodeName)
return madminProcInfo.NewJSONWith(&info), nil return madminProcInfo.NewJSONWith(&info), nil
} }
// GetMemInfoHandler - returns memory information. // GetMemInfoHandler - returns memory information.
func (s *peerRESTServer) GetMemInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.MemInfo], *grid.RemoteErr) { func (s *peerRESTServer) GetMemInfoHandler(_ *grid.MSS) (*grid.JSON[madmin.MemInfo], *grid.RemoteErr) {
info := madmin.GetMemInfo(context.Background(), globalMinioHost) info := madmin.GetMemInfo(context.Background(), globalLocalNodeName)
return madminMemInfo.NewJSONWith(&info), nil return madminMemInfo.NewJSONWith(&info), nil
} }
@ -445,20 +445,20 @@ func (s *peerRESTServer) GetMetricsHandler(v *grid.URLValues) (*grid.JSON[madmin
// GetSysConfigHandler - returns system config information. // GetSysConfigHandler - returns system config information.
// (only the config that are of concern to minio) // (only the config that are of concern to minio)
func (s *peerRESTServer) GetSysConfigHandler(_ *grid.MSS) (*grid.JSON[madmin.SysConfig], *grid.RemoteErr) { func (s *peerRESTServer) GetSysConfigHandler(_ *grid.MSS) (*grid.JSON[madmin.SysConfig], *grid.RemoteErr) {
info := madmin.GetSysConfig(context.Background(), globalMinioHost) info := madmin.GetSysConfig(context.Background(), globalLocalNodeName)
return madminSysConfig.NewJSONWith(&info), nil return madminSysConfig.NewJSONWith(&info), nil
} }
// GetSysServicesHandler - returns system services information. // GetSysServicesHandler - returns system services information.
// (only the services that are of concern to minio) // (only the services that are of concern to minio)
func (s *peerRESTServer) GetSysServicesHandler(_ *grid.MSS) (*grid.JSON[madmin.SysServices], *grid.RemoteErr) { func (s *peerRESTServer) GetSysServicesHandler(_ *grid.MSS) (*grid.JSON[madmin.SysServices], *grid.RemoteErr) {
info := madmin.GetSysServices(context.Background(), globalMinioHost) info := madmin.GetSysServices(context.Background(), globalLocalNodeName)
return madminSysServices.NewJSONWith(&info), nil return madminSysServices.NewJSONWith(&info), nil
} }
// GetSysErrorsHandler - returns system level errors // GetSysErrorsHandler - returns system level errors
func (s *peerRESTServer) GetSysErrorsHandler(_ *grid.MSS) (*grid.JSON[madmin.SysErrors], *grid.RemoteErr) { func (s *peerRESTServer) GetSysErrorsHandler(_ *grid.MSS) (*grid.JSON[madmin.SysErrors], *grid.RemoteErr) {
info := madmin.GetSysErrors(context.Background(), globalMinioHost) info := madmin.GetSysErrors(context.Background(), globalLocalNodeName)
return madminSysErrors.NewJSONWith(&info), nil return madminSysErrors.NewJSONWith(&info), nil
} }