Skip to content

[core] fix a recursive mutex locking in task #677

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
justonedev1 merged 2 commits into from
Mar 28, 2025
Merged

[core] fix a recursive mutex locking in task #677

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56edb77
[core] fix a recursive mutex locking in task
knopers8 Mar 27, 2025
82f6320
[core] when getting task traits, retrieve parent only once for thread…
knopers8 Mar 27, 2025
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
12 changes: 11 additions & 1 deletion core/task/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,16 @@ func (t *Task) GetTraits() Traits {
return Traits{}
}

// lock-free version of GetTraits
func (t *Task) getTraits() Traits {
if class := t.GetTaskClass(); class != nil {
if t.parent != nil {
return t.parent.GetTaskTraits()
}
}
return Traits{}
}

Copy link
Copy Markdown
Collaborator

@justonedev1 justonedev1 Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like how it is literally the same code for GetTraits() and getTraits() except t.parent part. I'd probably make getTraits(*parentRole) and call it from GetTraits, because the t.GetParent() usage in this case is not thread safe either way. We call it twice, so if there is a change of a parent from other goroutine, we might get different results on both calls due to race condition. With this change we will at least alway address the same parent, even if it changes half during the GetTraits call.

Copy link
Copy Markdown
Collaborator Author

@knopers8 knopers8 Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean something like this?

// Returns a consolidated CommandInfo for this Task, based on Roles tree and
// Class.
func (t *Task) BuildTaskCommand(role parentRole) (err error) {
Expand Down Expand Up @@ -525,7 +535,7 @@ func (t *Task) SendEvent(ev event.Event) {
Hostname: t.hostname,
ClassName: t.className,
Path: t.getParentRolePath(),
Traits: traitsToPbTraits(t.GetTraits()),
Traits: traitsToPbTraits(t.getTraits()),
}

if t.parent == nil {
Expand Down