metrics: use atomic type (#27121) #384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DNK90
approved these changes
Nov 29, 2023
minh-bq
added a commit
to minh-bq/ronin
that referenced
this pull request
Feb 20, 2024
We observe the data race warning when enabling metric
WARNING: DATA RACE
Read at 0x00c02cc7fe90 by goroutine 49:
github.com/ethereum/go-ethereum/metrics.(*StandardMeter).Snapshot()
github.com/ethereum/go-ethereum/metrics/meter.go:244 +0x6e
github.com/ethereum/go-ethereum/metrics/prometheus.Handler.func1()
github.com/ethereum/go-ethereum/metrics/prometheus/prometheus.go:55 +0x3c2
Previous write at 0x00c02cc7fe90 by goroutine 251:
sync/atomic.AddInt64()
runtime/race_amd64.s:289 +0xb
sync/atomic.AddInt64()
<autogenerated>:1 +0x1b
github.com/ethereum/go-ethereum/p2p.(*rlpxTransport).WriteMsg()
github.com/ethereum/go-ethereum/p2p/transport.go:103 +0x4c3
github.com/ethereum/go-ethereum/p2p.(*conn).WriteMsg()
<autogenerated>:1 +0xb9
The data race happens on StandardMeter.snapshot.temp field. This field access does not follow the StandardMeter.lock but use atomic access. The write side in StandardMeter.Mark is atomic, however, the read side in StandardMeter.Snapshot is not.
We cherry-pick this commit to correctly use atomic read of StandardMeter.snapshot.temp in StandardMeter.Snapshot. This commit also replaces the use of atomic.Load/StoreInt64 with atomic.Int64 type.
Co-authored-by: s7v7nislands <s7v7nislands@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We observe the data race warning when enabling metric
The data race happens on StandardMeter.snapshot.temp field. This field access does not follow the StandardMeter.lock but use atomic access. The write side in StandardMeter.Mark is atomic, however, the read side in StandardMeter.Snapshot is not.
We cherry-pick this commit to correctly use atomic read of StandardMeter.snapshot.temp in StandardMeter.Snapshot. This commit also replaces the use of atomic.Load/StoreInt64 with atomic.Int64 type.