MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 07:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: race when accessing REST TCP dial values (#15770)

Browse Source
This commit is contained in:
Anis Elleuch 2022-09-29 17:27:58 +01:00 committed by GitHub
parent f69a98ce49
commit 6287e8c571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/rest/rpc-stats.go
View File

@ -54,26 +54,26 @@ func GetRPCStats() RPCStats {
// Return a function which update the global stats related to tcp connections // Return a function which update the global stats related to tcp connections
func setupReqStatsUpdate(req *http.Request) (*http.Request, func()) { func setupReqStatsUpdate(req *http.Request) (*http.Request, func()) {
var dialStart, dialEnd time.Time var dialStart, dialEnd int64
trace := &httptrace.ClientTrace{ trace := &httptrace.ClientTrace{
ConnectStart: func(network, addr string) { ConnectStart: func(network, addr string) {
dialStart = time.Now() atomic.StoreInt64(&dialStart, time.Now().UnixNano())
}, },
ConnectDone: func(network, addr string, err error) { ConnectDone: func(network, addr string, err error) {
if err == nil { if err == nil {
dialEnd = time.Now() atomic.StoreInt64(&dialEnd, time.Now().UnixNano())
} }
}, },
} }
return req.WithContext(httptrace.WithClientTrace(req.Context(), trace)), func() { return req.WithContext(httptrace.WithClientTrace(req.Context(), trace)), func() {
if !dialStart.IsZero() { if ds := atomic.LoadInt64(&dialStart); ds > 0 {
if dialEnd.IsZero() { if de := atomic.LoadInt64(&dialEnd); de == 0 {
atomic.AddUint64(&globalStats.tcpDialErrs, 1) atomic.AddUint64(&globalStats.tcpDialErrs, 1)
} else { } else if de >= ds {
atomic.AddUint64(&globalStats.tcpDialCount, 1) atomic.AddUint64(&globalStats.tcpDialCount, 1)
atomic.AddUint64(&globalStats.tcpDialTotalDur, uint64(dialEnd.Sub(dialStart))) atomic.AddUint64(&globalStats.tcpDialTotalDur, uint64(dialEnd-dialStart))
} }
} }
} }