luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Backport of bug: prevent go routine leakage due to existing DeferCheck into release/1.16.x (#18565) 

* backport of commit 06d4c72f682881c78265248fb749ebfd5cc365b8

* backport of commit 42c37bb2c1e4d8eac8078f17c16b8e6797baa446

---------

Co-authored-by: cskh <hui.kang@hashicorp.com>
This commit is contained in:
hc-github-team-consul-core 2023-08-23 10:04:19 -05:00 committed by GitHub
parent ad458ac361
commit b63db8b411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/18558.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
check: prevent go routine leakage when existing Defercheck of same check id is not nil
```

6
agent/local/state.go
View File

@ -838,6 +838,12 @@ func (l *State) setCheckStateLocked(c *CheckState) {
existing := l.checks[id] existing := l.checks[id]
if existing != nil { if existing != nil {
c.InSync = c.Check.IsSame(existing.Check) c.InSync = c.Check.IsSame(existing.Check)
// If the existing check has a Defercheck, it needs to be
// assigned to the new check
if existing.DeferCheck != nil && c.DeferCheck == nil {
c.DeferCheck = existing.DeferCheck
c.InSync = false
}
} }
l.checks[id] = c l.checks[id] = c