MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Fix Net tests being omitted (#9234)

This commit is contained in:
Sidhartha Mani 2020-03-31 01:15:21 -07:00 committed by GitHub
parent ba52a925f9
commit 7b732b566f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/admin-handlers.go
View File

@ -1388,10 +1388,9 @@ func (a adminAPIHandlers) OBDInfoHandler(w http.ResponseWriter, r *http.Request)
w.Header().Set(xhttp.ContentType, string(mimeJSON)) w.Header().Set(xhttp.ContentType, string(mimeJSON))
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
enc := json.NewEncoder(w)
partialWrite := func() { partialWrite := func() {
jsonBytes, _ := json.Marshal(obdInfo) logger.LogIf(ctx, enc.Encode(obdInfo))
_, err := w.Write(jsonBytes)
logger.LogIf(ctx, err)
} }
finish := func() { finish := func() {

10
cmd/notification.go
View File

@ -911,17 +911,13 @@ func (sys *NotificationSys) NetOBDInfo(ctx context.Context) madmin.ServerNetOBDI
'x's should be tested, and 'o's should be skipped 'x's should be tested, and 'o's should be skipped
*/ */
stripPath := func(hostPath string) string {
return strings.Split(hostPath, slashSeparator)[0]
}
hostSet := set.NewStringSet() hostSet := set.NewStringSet()
for _, ez := range globalEndpoints { for _, ez := range globalEndpoints {
for _, e := range ez.Endpoints { for _, e := range ez.Endpoints {
host := stripPath(e.Host) if !hostSet.Contains(e.Host) {
if hostSet.Contains(host) { sortedGlobalEndpoints = append(sortedGlobalEndpoints, e.Host)
sortedGlobalEndpoints = append(sortedGlobalEndpoints, host) hostSet.Add(e.Host)
hostSet.Add(host)
} }
} }
} }