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

[8.0](backport #30638) Fix mutex unlocking in monitoring registry #30644

Merged
merged 1 commit into from
Mar 3, 2022
Merged

[8.0](backport #30638) Fix mutex unlocking in monitoring registry #30644

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
4 changes: 2 additions & 2 deletions libbeat/monitoring/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (r *Registry) Remove(name string) {
// Clear removes all entries from the current registry
func (r *Registry) Clear() error {
r.mu.Lock()
r.mu.Unlock()
defer r.mu.Unlock()

if r.opts.publishExpvar {
return errors.New("Can not clear registry with metrics being exported via expvar")
Expand Down Expand Up @@ -244,7 +244,7 @@ func (r *Registry) removeNames(names []string) {
if ok {
sub.removeNames(names[1:])
sub.mu.RLock()
sub.mu.RUnlock()
defer sub.mu.RUnlock()

if len(sub.entries) == 0 {
delete(r.entries, names[0])
Expand Down