mirror of
https://github.com/minio/minio.git
synced 2025-03-30 17:23:42 -04:00
allow sha256 payload to be configurable for object perf test (#18712)
Signed-off-by: Zhou Ting <ting.z.zhou@intel.com>
This commit is contained in:
parent
a50ea92c64
commit
31d16f6cc2
@ -1297,6 +1297,7 @@ func (a adminAPIHandlers) ObjectSpeedTestHandler(w http.ResponseWriter, r *http.
|
|||||||
customBucket := strings.TrimSpace(r.Form.Get(peerRESTBucket))
|
customBucket := strings.TrimSpace(r.Form.Get(peerRESTBucket))
|
||||||
autotune := r.Form.Get("autotune") == "true"
|
autotune := r.Form.Get("autotune") == "true"
|
||||||
noClear := r.Form.Get("noclear") == "true"
|
noClear := r.Form.Get("noclear") == "true"
|
||||||
|
enableSha256 := r.Form.Get("enableSha256") == "true"
|
||||||
|
|
||||||
size, err := strconv.Atoi(sizeStr)
|
size, err := strconv.Atoi(sizeStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -1366,6 +1367,7 @@ func (a adminAPIHandlers) ObjectSpeedTestHandler(w http.ResponseWriter, r *http.
|
|||||||
autotune: autotune,
|
autotune: autotune,
|
||||||
storageClass: storageClass,
|
storageClass: storageClass,
|
||||||
bucketName: customBucket,
|
bucketName: customBucket,
|
||||||
|
enableSha256: enableSha256,
|
||||||
})
|
})
|
||||||
var prevResult madmin.SpeedTestResult
|
var prevResult madmin.SpeedTestResult
|
||||||
for {
|
for {
|
||||||
|
@ -921,6 +921,7 @@ func (client *peerRESTClient) SpeedTest(ctx context.Context, opts speedTestOpts)
|
|||||||
values.Set(peerRESTDuration, opts.duration.String())
|
values.Set(peerRESTDuration, opts.duration.String())
|
||||||
values.Set(peerRESTStorageClass, opts.storageClass)
|
values.Set(peerRESTStorageClass, opts.storageClass)
|
||||||
values.Set(peerRESTBucket, opts.bucketName)
|
values.Set(peerRESTBucket, opts.bucketName)
|
||||||
|
values.Set(peerRESTEnableSha256, strconv.FormatBool(opts.enableSha256))
|
||||||
|
|
||||||
respBody, err := client.callWithContext(context.Background(), peerRESTMethodSpeedTest, values, nil, -1)
|
respBody, err := client.callWithContext(context.Background(), peerRESTMethodSpeedTest, values, nil, -1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -100,6 +100,7 @@ const (
|
|||||||
peerRESTConcurrent = "concurrent"
|
peerRESTConcurrent = "concurrent"
|
||||||
peerRESTDuration = "duration"
|
peerRESTDuration = "duration"
|
||||||
peerRESTStorageClass = "storage-class"
|
peerRESTStorageClass = "storage-class"
|
||||||
|
peerRESTEnableSha256 = "enableSha256"
|
||||||
peerRESTMetricsTypes = "types"
|
peerRESTMetricsTypes = "types"
|
||||||
peerRESTDisk = "disk"
|
peerRESTDisk = "disk"
|
||||||
peerRESTHost = "host"
|
peerRESTHost = "host"
|
||||||
|
@ -1304,6 +1304,7 @@ func (s *peerRESTServer) SpeedTestHandler(w http.ResponseWriter, r *http.Request
|
|||||||
concurrentStr := r.Form.Get(peerRESTConcurrent)
|
concurrentStr := r.Form.Get(peerRESTConcurrent)
|
||||||
storageClass := r.Form.Get(peerRESTStorageClass)
|
storageClass := r.Form.Get(peerRESTStorageClass)
|
||||||
bucketName := r.Form.Get(peerRESTBucket)
|
bucketName := r.Form.Get(peerRESTBucket)
|
||||||
|
enableSha256 := r.Form.Get(peerRESTEnableSha256) == "true"
|
||||||
|
|
||||||
size, err := strconv.Atoi(sizeStr)
|
size, err := strconv.Atoi(sizeStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -1328,6 +1329,7 @@ func (s *peerRESTServer) SpeedTestHandler(w http.ResponseWriter, r *http.Request
|
|||||||
duration: duration,
|
duration: duration,
|
||||||
storageClass: storageClass,
|
storageClass: storageClass,
|
||||||
bucketName: bucketName,
|
bucketName: bucketName,
|
||||||
|
enableSha256: enableSha256,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
result.Error = err.Error()
|
result.Error = err.Error()
|
||||||
|
@ -95,7 +95,7 @@ func selfSpeedTest(ctx context.Context, opts speedTestOpts) (SpeedTestResult, er
|
|||||||
userMetadata[globalObjectPerfUserMetadata] = "true" // Bypass S3 API freeze
|
userMetadata[globalObjectPerfUserMetadata] = "true" // Bypass S3 API freeze
|
||||||
popts := minio.PutObjectOptions{
|
popts := minio.PutObjectOptions{
|
||||||
UserMetadata: userMetadata,
|
UserMetadata: userMetadata,
|
||||||
DisableContentSha256: true,
|
DisableContentSha256: !opts.enableSha256,
|
||||||
DisableMultipart: true,
|
DisableMultipart: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@ type speedTestOpts struct {
|
|||||||
autotune bool
|
autotune bool
|
||||||
storageClass string
|
storageClass string
|
||||||
bucketName string
|
bucketName string
|
||||||
|
enableSha256 bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the max throughput and iops numbers.
|
// Get the max throughput and iops numbers.
|
||||||
@ -163,6 +164,7 @@ func objectSpeedTest(ctx context.Context, opts speedTestOpts) chan madmin.SpeedT
|
|||||||
duration: opts.duration,
|
duration: opts.duration,
|
||||||
storageClass: opts.storageClass,
|
storageClass: opts.storageClass,
|
||||||
bucketName: opts.bucketName,
|
bucketName: opts.bucketName,
|
||||||
|
enableSha256: opts.enableSha256,
|
||||||
}
|
}
|
||||||
|
|
||||||
results := globalNotificationSys.SpeedTest(ctx, sopts)
|
results := globalNotificationSys.SpeedTest(ctx, sopts)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user