Skip to content

fix(workflow/sync): use RWMutex to prevent concurrent map access (cherry-pick #14321) #14322

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

Merged
Joibel merged 1 commit into from
Mar 24, 2025
Merged

fix(workflow/sync): use RWMutex to prevent concurrent map access (cherry-pick #14321) #14322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions workflow/sync/sync_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type (

type Manager struct {
syncLockMap map[string]semaphore
lock *sync.Mutex
lock *sync.RWMutex
nextWorkflow NextWorkflow
getSyncLimit GetSyncLimit
isWFDeleted IsWorkflowDeleted
Expand All @@ -29,7 +29,7 @@ type Manager struct {
func NewLockManager(getSyncLimit GetSyncLimit, nextWorkflow NextWorkflow, isWFDeleted IsWorkflowDeleted) *Manager {
return &Manager{
syncLockMap: make(map[string]semaphore),
lock: &sync.Mutex{},
lock: &sync.RWMutex{},
nextWorkflow: nextWorkflow,
getSyncLimit: getSyncLimit,
isWFDeleted: isWFDeleted,
Expand All @@ -50,6 +50,9 @@ func (sm *Manager) getWorkflowKey(key string) (string, error) {
func (sm *Manager) CheckWorkflowExistence() {
defer runtimeutil.HandleCrash(runtimeutil.PanicHandlers...)

sm.lock.RLock()
defer sm.lock.RUnlock()

log.Debug("Check the workflow existence")
for _, lock := range sm.syncLockMap {
keys := lock.getCurrentHolders()
Expand Down Expand Up @@ -311,8 +314,8 @@ func (sm *Manager) Release(ctx context.Context, wf *wfv1.Workflow, nodeName stri
return
}

sm.lock.Lock()
defer sm.lock.Unlock()
sm.lock.RLock()
defer sm.lock.RUnlock()

holderKey := getHolderKey(wf, nodeName)
// Ignoring error here is as good as it's going to be, we shouldn't get here as we should
Expand All @@ -336,8 +339,8 @@ func (sm *Manager) Release(ctx context.Context, wf *wfv1.Workflow, nodeName stri
}

func (sm *Manager) ReleaseAll(wf *wfv1.Workflow) bool {
sm.lock.Lock()
defer sm.lock.Unlock()
sm.lock.RLock()
defer sm.lock.RUnlock()

if wf.Status.Synchronization == nil {
return true
Expand Down