MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 05:34:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stream bucket bandwidth measurements (#11014)

Browse Source
This commit is contained in:
Ritesh H Shukla
2020-12-03 11:34:42 -08:00
committed by GitHub
parent d54cf77356
commit 7e2b79984e
3 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/madmin/bandwidth.go
View File

@@ -20,7 +20,6 @@ package madmin
import (
"context"
"encoding/json"
"io"
"net/http"
"net/url"
"strings"
@@ -28,10 +27,17 @@ import (
"github.com/minio/minio/pkg/bandwidth"
)
// GetBucketBandwidth - Get a snapshot of the bandwidth measurements for replication buckets. If no buckets
// generate replication traffic an empty map is returned.
func (adm *AdminClient) GetBucketBandwidth(ctx context.Context, buckets ...string) (bandwidth.Report, error) {
// Report includes the bandwidth report or the error encountered.
type Report struct {
Report bandwidth.Report
Err error
}
// GetBucketBandwidth - Gets a channel reporting bandwidth measurements for replication buckets. If no buckets
// generate replication traffic an empty map is returned in the report until traffic is seen.
func (adm *AdminClient) GetBucketBandwidth(ctx context.Context, buckets ...string) <-chan Report {
queryValues := url.Values{}
ch := make(chan Report)
if len(buckets) > 0 {
queryValues.Set("buckets", strings.Join(buckets, ","))
}
@@ -40,22 +46,37 @@ func (adm *AdminClient) GetBucketBandwidth(ctx context.Context, buckets ...strin
relPath: adminAPIPrefix + "/bandwidth",
queryValues: queryValues,
}
resp, err := adm.executeMethod(ctx, http.MethodGet, reqData)
defer closeResponse(resp)
if err != nil {
return bandwidth.Report{}, err
defer closeResponse(resp)
ch <- Report{bandwidth.Report{}, err}
return ch
}
if resp.StatusCode != http.StatusOK {
return bandwidth.Report{}, httpRespToErrorResponse(resp)
ch <- Report{bandwidth.Report{}, httpRespToErrorResponse(resp)}
return ch
}
dec := json.NewDecoder(resp.Body)
for {
var report bandwidth.Report
err = dec.Decode(&report)
if err != nil && err != io.EOF {
return bandwidth.Report{}, err
go func(ctx context.Context, ch chan<- Report, resp *http.Response) {
defer func() {
closeResponse(resp)
close(ch)
}()
for {
var report bandwidth.Report
if err = dec.Decode(&report); err != nil {
ch <- Report{bandwidth.Report{}, err}
return
}
select {
case <-ctx.Done():
return
case ch <- Report{Report: report, Err: err}:
}
}
return report, nil
}
}(ctx, ch, resp)
return ch
}

19
pkg/madmin/examples/bucket-bandwidth.go
View File

@@ -35,16 +35,15 @@ func main() {
log.Fatalln(err)
}
ctx := context.Background()
report, err := madminClient.GetBucketBandwidth(ctx)
if err != nil {
log.Fatalln(err)
return
reportCh := madminClient.GetBucketBandwidth(ctx)
for i := 0; i < 10; i++ {
report := <-reportCh
fmt.Printf("Report: %+v\n", report)
}
fmt.Printf("Report: %+v\n", report)
report, err = madminClient.GetBucketBandwidth(ctx, "sourceBucket", "sourceBucket2")
if err != nil {
log.Fatalln(err)
return
reportCh = madminClient.GetBucketBandwidth(ctx, "sourceBucket", "sourceBucket2")
for i := 0; i < 10; i++ {
report := <-reportCh
fmt.Printf("Report: %+v\n", report)
}
fmt.Printf("Report: %+v\n", report)
}