diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index 3c52a83ba..a07b3eb78 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -1959,11 +1959,6 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque } deadline := 10 * time.Second // Default deadline is 10secs for health diagnostics. - if query.Get(string(madmin.HealthDataTypePerfNet)) != "" || - query.Get(string(madmin.HealthDataTypePerfDrive)) != "" || - query.Get(string(madmin.HealthDataTypePerfObj)) != "" { - deadline = 1 * time.Hour - } if dstr := r.Form.Get("deadline"); dstr != "" { var err error deadline, err = time.ParseDuration(dstr) @@ -2225,87 +2220,6 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque } } - getAndWriteDrivePerfInfo := func() { - if query.Get(string(madmin.HealthDataTypePerfDrive)) == "true" { - opts := madmin.DriveSpeedTestOpts{ - Serial: false, - BlockSize: 4 * humanize.MiByte, - FileSize: 1 * humanize.GiByte, - } - - localDPI := driveSpeedTest(ctx, opts) - healthInfo.Perf.DrivePerf = append(healthInfo.Perf.DrivePerf, localDPI) - - perfCh := globalNotificationSys.DriveSpeedTest(ctx, opts) - for perfInfo := range perfCh { - healthInfo.Perf.DrivePerf = append(healthInfo.Perf.DrivePerf, perfInfo) - } - partialWrite(healthInfo) - } - } - - getAndWriteObjPerfInfo := func() { - if query.Get(string(madmin.HealthDataTypePerfObj)) == "true" { - concurrent := 32 - - storageInfo, _ := objectAPI.StorageInfo(ctx) - - size := 64 * humanize.MiByte - autotune := true - - sufficientCapacity, canAutotune, capacityErrMsg := validateObjPerfOptions(ctx, storageInfo, concurrent, size, autotune) - if !sufficientCapacity { - healthInfo.Perf.Error = capacityErrMsg - partialWrite(healthInfo) - return - } - - if !canAutotune { - autotune = false - } - - bucketExists, err := makeObjectPerfBucket(ctx, objectAPI, globalObjectPerfBucket) - if err != nil { - healthInfo.Perf.Error = "Unable to create bucket: " + err.Error() - partialWrite(healthInfo) - return - } - - if !bucketExists { - defer deleteObjectPerfBucket(objectAPI) - } - - opts := speedTestOpts{ - objectSize: size, - concurrencyStart: concurrent, - duration: 10 * time.Second, - autotune: autotune, - } - - perfCh := objectSpeedTest(ctx, opts) - for perfInfo := range perfCh { - healthInfo.Perf.ObjPerf = append(healthInfo.Perf.ObjPerf, perfInfo) - } - partialWrite(healthInfo) - } - } - - getAndWriteNetPerfInfo := func() { - if query.Get(string(madmin.HealthDataTypePerfObj)) == "true" { - if !globalIsDistErasure { - return - } - - netPerf := globalNotificationSys.Netperf(ctx, time.Second*10) - for _, np := range netPerf { - np.Endpoint = anonAddr(np.Endpoint) - healthInfo.Perf.NetPerf = append(healthInfo.Perf.NetPerf, np) - } - - partialWrite(healthInfo) - } - } - anonymizeNetwork := func(network map[string]string) map[string]string { anonNetwork := map[string]string{} for endpoint, status := range network { @@ -2335,9 +2249,6 @@ func (a adminAPIHandlers) HealthInfoHandler(w http.ResponseWriter, r *http.Reque getAndWriteMemInfo() getAndWriteProcInfo() getAndWriteMinioConfig() - getAndWriteDrivePerfInfo() - getAndWriteObjPerfInfo() - getAndWriteNetPerfInfo() getAndWriteSysErrors() getAndWriteSysServices() getAndWriteSysConfig() diff --git a/go.mod b/go.mod index 854dd673f..ccf2da3b6 100644 --- a/go.mod +++ b/go.mod @@ -41,13 +41,13 @@ require ( github.com/klauspost/reedsolomon v1.11.0 github.com/lib/pq v1.10.7 github.com/miekg/dns v1.1.50 - github.com/minio/cli v1.23.0 - github.com/minio/console v0.20.5 + github.com/minio/cli v1.24.0 + github.com/minio/console v0.20.6-0.20221003060434-413870e995a9 github.com/minio/csvparser v1.0.0 github.com/minio/dperf v0.4.2 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.21.0 - github.com/minio/madmin-go v1.4.29 + github.com/minio/madmin-go v1.5.3 github.com/minio/minio-go/v7 v7.0.40-0.20220928095841-8848d8affe8a github.com/minio/pkg v1.4.3 github.com/minio/selfupdate v0.5.0 @@ -165,7 +165,7 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/minio/colorjson v1.0.2 // indirect github.com/minio/filepath v1.0.0 // indirect - github.com/minio/mc v0.0.0-20220916091647-ad4441ef2b4b // indirect + github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index 2a5ccf7bd..9cdf2a1e5 100644 --- a/go.sum +++ b/go.sum @@ -631,12 +631,12 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/minio/argon2 v1.0.0/go.mod h1:XtOGJ7MjwUJDPtCqqrisx5QwVB/jDx+adQHigJVsQHQ= -github.com/minio/cli v1.23.0 h1:hNuf8xi/JU5EJRX+T38e2zcnh2EpdVqs8aH4lNXWe3w= -github.com/minio/cli v1.23.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= +github.com/minio/cli v1.24.0 h1:QrSIs7iISwaFmTlGFAR9cSpkZn7/tTaFsj5oAUCC47I= +github.com/minio/cli v1.24.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.2 h1:Em3IM68MTm3h+Oxa0nxrV9VQqDgbxvC5iq5A+pqzDeI= github.com/minio/colorjson v1.0.2/go.mod h1:JWxcL2n8T8JVf+NY6awl6kn5nK49aAzHOeQEM33dL0k= -github.com/minio/console v0.20.5 h1:LKsyiaBYSKqq/tbFFrnSjqx9LCapuP5ev1U31m6rQKQ= -github.com/minio/console v0.20.5/go.mod h1:+7tzuPr0JvXL8izQS809pkxkECzTSKRVl0H0XqLqALk= +github.com/minio/console v0.20.6-0.20221003060434-413870e995a9 h1:ECE/brI3vywIANrqWVsPVIlSC2KJlLOyMa7KppBs0nI= +github.com/minio/console v0.20.6-0.20221003060434-413870e995a9/go.mod h1:Zp6YYNhwNi4c6nDsiyxSKeJTaWA/LAyAIwIxs75Qhro= github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/dperf v0.4.2 h1:u2fcdXViX3+alZcEYSOh1crNbGtVU5drQ24lP3Xx6j8= @@ -649,10 +649,10 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/kes v0.21.0 h1:Xe0vNRyBgC35TZkbOnU4hAgJRBEaFcT6KiI9/29BdUo= github.com/minio/kes v0.21.0/go.mod h1:3FW1BQkMGQW78yhy+69tUq5bdcf5rnXJizyeKB9a/tc= github.com/minio/madmin-go v1.3.5/go.mod h1:vGKGboQgGIWx4DuDUaXixjlIEZOCIp6ivJkQoiVaACc= -github.com/minio/madmin-go v1.4.29 h1:Cu3F8Bh4vZNtNjrhAZnoM985hgXUDLUzJavUACafNc0= -github.com/minio/madmin-go v1.4.29/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98= -github.com/minio/mc v0.0.0-20220916091647-ad4441ef2b4b h1:cno6g1GGLTH7u0lK9J1oMegnF1VLHxUiQsRvlFNlzu4= -github.com/minio/mc v0.0.0-20220916091647-ad4441ef2b4b/go.mod h1:lYUHV/9ulBImhCtyt1mMXKq7yEVkasxdJBHfsS++FkQ= +github.com/minio/madmin-go v1.5.3 h1:G/xtuOzKuQf2wJhyH2I/wyO6aNzkHQm1sUmpdURbScY= +github.com/minio/madmin-go v1.5.3/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98= +github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4 h1:DStvFAaRrNCvAa6je41F8WBgziXeF1sZymSQJCWxbKY= +github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4/go.mod h1:cqIVmUIAVDVCwR2/XztvlBdZpbI/hPx0ilEOvtG47Tw= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=