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

Jump to bottom

fix: Fix concurrency issues with metrics #3401

Merged
merged 1 commit into from
Jul 7, 2020
Merged

fix: Fix concurrency issues with metrics #3401

merged 1 commit into from
Jul 7, 2020

Conversation

simster7
Copy link
Member

@simster7 simster7 commented Jul 7, 2020 •
edited
Loading

Fixes: #3391

alexec
alexec reviewed Jul 7, 2020
View reviewed changes
workflow/metrics/metrics.go
@@ -89,28 +91,41 @@ func (m *Metrics) allMetrics() []prometheus.Metric {
}

func (m *Metrics) WorkflowAdded(key string, phase v1alpha1.NodePhase) {
if m.workflows[key] {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you simplify to use sync.Mutex for and defer. I think the benefit of simpler code would outweight the reduced efficiency.

alexec
alexec reviewed Jul 7, 2020
View reviewed changes
workflow/metrics/metrics.go Outdated
@@ -34,6 +35,7 @@ type metric struct {
}

type Metrics struct {
workflowsMutex sync.RWMutex
Copy link
Contributor

Choose a reason for hiding this comment

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

you might want to comment and say what fields this is used to lock on

alexec
alexec approved these changes Jul 7, 2020
View reviewed changes
Copy link
Contributor

@alexec alexec left a comment

Choose a reason for hiding this comment

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

Can we please backport to v2.9?

@simster7 simster7 merged commit 7011160 into argoproj:master Jul 7, 2020
simster7 added a commit that referenced this pull request Jul 7, 2020
@simster7
fix: Fix concurrency issues with metrics (#3401)
6378a58
@simster7
Copy link
Member Author

simster7 commented Jul 7, 2020

Back-ported to 2.9.2

@simster7 simster7 mentioned this pull request Jul 30, 2020
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexec alexec alexec approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fatal error: concurrent map read and map write
2 participants
@simster7 @alexec