MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow drive tests to respond only drive paths

Browse Source
This commit is contained in:
Harshavardhana 2022-02-25 18:06:38 -08:00
parent 88fd1cba71
commit b7c90751b0
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/speedtest.go
View File

@ -19,8 +19,6 @@ package cmd
import ( import (
"context" "context"
"os"
"path/filepath"
"sort" "sort"
"time" "time"
@ -28,8 +26,6 @@ import (
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
) )
var dperfUUID = mustGetUUID()
type speedTestOpts struct { type speedTestOpts struct {
throughputSize int throughputSize int
concurrencyStart int concurrencyStart int
@ -171,29 +167,23 @@ func driveSpeedTest(ctx context.Context, opts madmin.DriveSpeedTestOpts) madmin.
BlockSize: opts.BlockSize, BlockSize: opts.BlockSize,
FileSize: opts.FileSize, FileSize: opts.FileSize,
} }
paths := func() []string {
toRet := []string{} localPaths := globalEndpoints.LocalDisksPaths()
paths := globalEndpoints.LocalDisksPaths() paths := func() (tmpPaths []string) {
for _, p := range paths { for _, lp := range localPaths {
dperfFilename := filepath.Join(p, ".minio.sys", "tmp", dperfUUID) tmpPaths = append(tmpPaths, pathJoin(lp, minioMetaTmpBucket))
if _, err := os.Stat(dperfFilename); err == nil {
// file exists, so remove it
os.Remove(dperfFilename)
} }
toRet = append(toRet, dperfFilename) return tmpPaths
}
return toRet
}() }()
perfs, err := perf.Run(ctx, paths...) perfs, err := perf.Run(ctx, paths...)
return madmin.DriveSpeedTestResult{ return madmin.DriveSpeedTestResult{
Endpoint: globalLocalNodeName, Endpoint: globalLocalNodeName,
Version: Version, Version: Version,
DrivePerf: func() []madmin.DrivePerf { DrivePerf: func() (results []madmin.DrivePerf) {
results := []madmin.DrivePerf{} for idx, r := range perfs {
for _, r := range perfs {
result := madmin.DrivePerf{ result := madmin.DrivePerf{
Path: r.Path, Path: localPaths[idx],
ReadThroughput: r.ReadThroughput, ReadThroughput: r.ReadThroughput,
WriteThroughput: r.WriteThroughput, WriteThroughput: r.WriteThroughput,
Error: func() string { Error: func() string {

2
go.mod
View File

@ -47,7 +47,7 @@ require (
github.com/minio/cli v1.22.0 github.com/minio/cli v1.22.0
github.com/minio/console v0.14.8 github.com/minio/console v0.14.8
github.com/minio/csvparser v1.0.0 github.com/minio/csvparser v1.0.0
github.com/minio/dperf v0.2.1-0.20220126071331-eefa6468e289 github.com/minio/dperf v0.3.2
github.com/minio/highwayhash v1.0.2 github.com/minio/highwayhash v1.0.2
github.com/minio/kes v0.14.0 github.com/minio/kes v0.14.0
github.com/minio/madmin-go v1.3.4 github.com/minio/madmin-go v1.3.4

4
go.sum
View File

@ -833,8 +833,8 @@ github.com/minio/csvparser v1.0.0 h1:xJEHcYK8ZAjeW4hNV9Zu30u+/2o4UyPnYgyjWp8b7ZU
github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM= github.com/minio/csvparser v1.0.0/go.mod h1:lKXskSLzPgC5WQyzP7maKH7Sl1cqvANXo9YCto8zbtM=
github.com/minio/direct-csi v1.3.5-0.20210601185811-f7776f7961bf h1:wylCc/PdvdTIqYqVNEU9LJAZBanvfGY1TwTnjM3zQaA= github.com/minio/direct-csi v1.3.5-0.20210601185811-f7776f7961bf h1:wylCc/PdvdTIqYqVNEU9LJAZBanvfGY1TwTnjM3zQaA=
github.com/minio/direct-csi v1.3.5-0.20210601185811-f7776f7961bf/go.mod h1:ryRFbKRDMZ1+kGF5EZwuyfF1a/eAu4c9uxZdF0fnmuY= github.com/minio/direct-csi v1.3.5-0.20210601185811-f7776f7961bf/go.mod h1:ryRFbKRDMZ1+kGF5EZwuyfF1a/eAu4c9uxZdF0fnmuY=
github.com/minio/dperf v0.2.1-0.20220126071331-eefa6468e289 h1:/xkr1EFJyQIqrXL/eWVSv3tWAbhFsGOQ2HCiabVkvNY= github.com/minio/dperf v0.3.2 h1:iKTEgXcyncohWh/tLktZ25/9CcxIJfG9pqWvSnozgCc=
github.com/minio/dperf v0.2.1-0.20220126071331-eefa6468e289/go.mod h1:eSYYs7XI/TyAWX+ekAmV9kAA85wGqlnSNpkjh+fR/M4= github.com/minio/dperf v0.3.2/go.mod h1:mo7rPmlIl3Bgn8CrM0Yjeu3AL3xXVd7sH7Hpj4OGK1E=
github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY= github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY=
github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw= github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw=
github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=