mirror of
https://github.com/minio/minio.git
synced 2025-11-09 13:39:46 -05:00
Use new gofumpt (#21613)
Update tinylib. Should fix CI. `gofumpt -w .&&go generate ./...`
This commit is contained in:
@@ -18,7 +18,11 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
xhttp "github.com/minio/minio/internal/http"
|
||||
)
|
||||
|
||||
// Test redactLDAPPwd()
|
||||
@@ -52,3 +56,129 @@ func TestRedactLDAPPwd(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TestHTTPStatsRaceCondition tests the race condition fix for HTTPStats.
|
||||
// This test specifically addresses the race between:
|
||||
// - Write operations via updateStats.
|
||||
// - Read operations via toServerHTTPStats(false).
|
||||
func TestRaulStatsRaceCondition(t *testing.T) {
|
||||
httpStats := newHTTPStats()
|
||||
// Simulate the concurrent scenario from the original race condition:
|
||||
// Multiple HTTP request handlers updating stats concurrently,
|
||||
// while background processes are reading the stats for persistence.
|
||||
const numWriters = 100 // Simulate many HTTP request handlers.
|
||||
const numReaders = 50 // Simulate background stats readers.
|
||||
const opsPerGoroutine = 100
|
||||
|
||||
var wg sync.WaitGroup
|
||||
for i := range numWriters {
|
||||
wg.Add(1)
|
||||
go func(writerID int) {
|
||||
defer wg.Done()
|
||||
for j := 0; j < opsPerGoroutine; j++ {
|
||||
switch j % 4 {
|
||||
case 0:
|
||||
httpStats.updateStats("GetObject", &xhttp.ResponseRecorder{})
|
||||
case 1:
|
||||
httpStats.totalS3Requests.Inc("PutObject")
|
||||
case 2:
|
||||
httpStats.totalS3Errors.Inc("DeleteObject")
|
||||
case 3:
|
||||
httpStats.currentS3Requests.Inc("ListObjects")
|
||||
}
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
|
||||
for i := range numReaders {
|
||||
wg.Add(1)
|
||||
go func(readerID int) {
|
||||
defer wg.Done()
|
||||
for range opsPerGoroutine {
|
||||
_ = httpStats.toServerHTTPStats(false)
|
||||
_ = httpStats.totalS3Requests.Load(false)
|
||||
_ = httpStats.currentS3Requests.Load(false)
|
||||
time.Sleep(1 * time.Microsecond)
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
finalStats := httpStats.toServerHTTPStats(false)
|
||||
totalRequests := 0
|
||||
for _, v := range finalStats.TotalS3Requests.APIStats {
|
||||
totalRequests += v
|
||||
}
|
||||
if totalRequests == 0 {
|
||||
t.Error("Expected some total requests to be recorded, but got zero")
|
||||
}
|
||||
t.Logf("Total requests recorded: %d", totalRequests)
|
||||
t.Logf("Race condition test passed - no races detected")
|
||||
}
|
||||
|
||||
// TestHTTPAPIStatsRaceCondition tests concurrent access to HTTPAPIStats specifically.
|
||||
func TestRaulHTTPAPIStatsRaceCondition(t *testing.T) {
|
||||
stats := &HTTPAPIStats{}
|
||||
const numGoroutines = 50
|
||||
const opsPerGoroutine = 1000
|
||||
|
||||
var wg sync.WaitGroup
|
||||
for i := range numGoroutines {
|
||||
wg.Add(1)
|
||||
go func(id int) {
|
||||
defer wg.Done()
|
||||
for j := 0; j < opsPerGoroutine; j++ {
|
||||
stats.Inc("TestAPI")
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
|
||||
for i := range numGoroutines / 2 {
|
||||
wg.Add(1)
|
||||
go func(id int) {
|
||||
defer wg.Done()
|
||||
for range opsPerGoroutine / 2 {
|
||||
_ = stats.Load(false)
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
finalStats := stats.Load(false)
|
||||
expected := numGoroutines * opsPerGoroutine
|
||||
actual := finalStats["TestAPI"]
|
||||
if actual != expected {
|
||||
t.Errorf("Race condition detected: expected %d, got %d (lost %d increments)",
|
||||
expected, actual, expected-actual)
|
||||
}
|
||||
}
|
||||
|
||||
// TestBucketHTTPStatsRaceCondition tests concurrent access to bucket-level HTTP stats.
|
||||
func TestRaulBucketHTTPStatsRaceCondition(t *testing.T) {
|
||||
bucketStats := newBucketHTTPStats()
|
||||
const numGoroutines = 50
|
||||
const opsPerGoroutine = 100
|
||||
|
||||
var wg sync.WaitGroup
|
||||
for i := range numGoroutines {
|
||||
wg.Add(1)
|
||||
go func(id int) {
|
||||
defer wg.Done()
|
||||
bucketName := "test-bucket"
|
||||
|
||||
for range opsPerGoroutine {
|
||||
bucketStats.updateHTTPStats(bucketName, "GetObject", nil)
|
||||
recorder := &xhttp.ResponseRecorder{}
|
||||
bucketStats.updateHTTPStats(bucketName, "GetObject", recorder)
|
||||
_ = bucketStats.load(bucketName)
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
stats := bucketStats.load("test-bucket")
|
||||
if stats.totalS3Requests == nil {
|
||||
t.Error("Expected bucket stats to be initialized")
|
||||
}
|
||||
t.Logf("Bucket HTTP stats race test passed")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user