From 44decbeae063e0e88e5a90317d1cf8df2ad5cccd Mon Sep 17 00:00:00 2001 From: Sidhartha Mani Date: Wed, 8 Apr 2020 06:04:27 -0700 Subject: [PATCH] increase drive OBD blocksize to 4MB (#9258) --- pkg/disk/obd.go | 2 +- pkg/madmin/obd.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/disk/obd.go b/pkg/disk/obd.go index a8f0055a6..c8ee2c7fe 100644 --- a/pkg/disk/obd.go +++ b/pkg/disk/obd.go @@ -79,7 +79,7 @@ func GetOBDInfo(ctx context.Context, endpoint string) (Latency, Throughput, erro // } // } - blockSize := 1 * mb + blockSize := 4 * mb fileSize := 256 * mb latencies := make([]float64, fileSize/blockSize) diff --git a/pkg/madmin/obd.go b/pkg/madmin/obd.go index 81ac9ce29..9ebd70051 100644 --- a/pkg/madmin/obd.go +++ b/pkg/madmin/obd.go @@ -236,6 +236,7 @@ func (adm *AdminClient) ServerOBDInfo(ctx context.Context, obdDataTypes []OBDDat v.Set(string(d), "true") } var OBDInfoMessage OBDInfo + OBDInfoMessage.TimeStamp = time.Now() if v.Get(string(OBDDataTypeMinioInfo)) == "true" { info, err := adm.ServerInfo(ctx) @@ -259,8 +260,10 @@ func (adm *AdminClient) ServerOBDInfo(ctx context.Context, obdDataTypes []OBDDat respChan <- OBDInfo{ Error: err.Error(), } + close(respChan) return } + // Check response http status code if resp.StatusCode != http.StatusOK { respChan <- OBDInfo{ @@ -268,10 +271,13 @@ func (adm *AdminClient) ServerOBDInfo(ctx context.Context, obdDataTypes []OBDDat } return } + // Unmarshal the server's json response decoder := json.NewDecoder(resp.Body) for { err := decoder.Decode(&OBDInfoMessage) + OBDInfoMessage.TimeStamp = time.Now() + if err == io.EOF { break } @@ -283,7 +289,6 @@ func (adm *AdminClient) ServerOBDInfo(ctx context.Context, obdDataTypes []OBDDat respChan <- OBDInfoMessage } - OBDInfoMessage.TimeStamp = time.Now() respChan <- OBDInfoMessage close(respChan) }()