Skip to content

fix: subnet health triggering OOM, infinite loop #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2021
Merged

fix: subnet health triggering OOM, infinite loop #887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions restapi/client-admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"io"
"net/http"
"time"
Expand Down Expand Up @@ -355,25 +354,34 @@ func (ac AdminClient) serverHealthInfo(ctx context.Context, healthDataTypes []ma
decoder := json.NewDecoder(resp.Body)
switch version {
case madmin.HealthInfoVersion0:
info := madmin.HealthInfoV0{}
for {
var info madmin.HealthInfoV0
err = decoder.Decode(&info)
if err != nil && !errors.Is(err, io.EOF) {
return nil, version, err
if err = decoder.Decode(&info); err != nil {
break
}
}

healthInfo = mcCmd.MapHealthInfoToV1(info, nil)
// Old minio versions don't return the MinIO info in
// response of the healthinfo api. So fetch it separately
minioInfo, err := ac.Client.ServerInfo(ctx)
if err != nil {
info.Minio.Error = err.Error()
} else {
info.Minio.Info = minioInfo
}

healthInfo = mcCmd.MapHealthInfoToV1(info, nil)
version = madmin.HealthInfoVersion1
case madmin.HealthInfoVersion:
info := madmin.HealthInfo{}
for {
var info madmin.HealthInfo
if err != nil && !errors.Is(err, io.EOF) {
return nil, version, err
if err = decoder.Decode(&info); err != nil {
break
}

healthInfo = info
}
healthInfo = info
}

return healthInfo, version, nil
}

Expand Down