Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

analyzetest: fix data race in the test #40392

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −2
Open

analyzetest: fix data race in the test #40392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
045da9f
analyzetest: fix data race in the test
hawkingrei Jan 7, 2023
6badb04
Merge branch 'master' into fix_data_race_analyze_test
hawkingrei Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions executor/analyzetest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ go_test(
"main_test.go",
],
flaky = True,
race = "on",
shard_count = 50,
deps = [
"//domain",
Expand Down
4 changes: 3 additions & 1 deletion util/gctuner/mem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
package gctuner

import (
"sync/atomic"

"github.com/pingcap/tidb/util/memory"
)

func readMemoryInuse() uint64 {
memStats := memory.ForceReadMemStats()
return memStats.HeapInuse
return atomic.LoadUint64(&memStats.HeapInuse)
}
2 changes: 1 addition & 1 deletion util/memory/memstats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func ReadMemStats() (memStats *runtime.MemStats) {
}
failpoint.Inject("ReadMemStats", func(val failpoint.Value) {
injectedSize := val.(int)
memStats.HeapInuse += uint64(injectedSize)
atomic.AddUint64(&memStats.HeapInuse, uint64(injectedSize))
})
return
}
Expand Down