plugin/pkg/uniq: fix data race with sync.RWMutex (#7707)

Add RWMutex to protect concurrent map access in Set, Unset, and ForEach methods.
Change New() to return *U pointer type for proper synchronization.

Signed-off-by: Cangming H <cangmingh@gmail.com>
This commit is contained in:
cangming
2025-11-25 04:14:21 +08:00
committed by GitHub
parent 4f4f403567
commit 0ef4b55d8d

View File

@@ -2,9 +2,12 @@
// identical events will only be processed once. // identical events will only be processed once.
package uniq package uniq
import "sync"
// U keeps track of item to be done. // U keeps track of item to be done.
type U struct { type U struct {
u map[string]item mu sync.RWMutex
u map[string]item
} }
type item struct { type item struct {
@@ -13,10 +16,24 @@ type item struct {
} }
// New returns a new initialized U. // New returns a new initialized U.
func New() U { return U{u: make(map[string]item)} } func New() *U { return &U{u: make(map[string]item)} }
// Set sets function f in U under key. If the key already exists it is not overwritten. // Set sets function f in U under key. If the key already exists it is not overwritten.
func (u U) Set(key string, f func() error) { func (u *U) Set(key string, f func() error) {
// Read lock for check
u.mu.RLock()
_, exists := u.u[key]
u.mu.RUnlock()
if exists {
return
}
// Write lock for modification
u.mu.Lock()
defer u.mu.Unlock()
// Double-check to avoid TOCTOU
if _, ok := u.u[key]; ok { if _, ok := u.u[key]; ok {
return return
} }
@@ -24,12 +41,17 @@ func (u U) Set(key string, f func() error) {
} }
// Unset removes the key. // Unset removes the key.
func (u U) Unset(key string) { func (u *U) Unset(key string) {
u.mu.Lock()
defer u.mu.Unlock()
delete(u.u, key) delete(u.u, key)
} }
// ForEach iterates over u and executes f for each element that is 'todo' and sets it to 'done'. // ForEach iterates over u and executes f for each element that is 'todo' and sets it to 'done'.
func (u U) ForEach() error { func (u *U) ForEach() error {
u.mu.Lock()
defer u.mu.Unlock()
for k, v := range u.u { for k, v := range u.u {
if v.state == todo { if v.state == todo {
v.f() v.f()