Merge 06d4c72 into backport/gh-18429-deferrcheck-leak/blatantly-defin…

…ite-pony
hashicorp · Aug 23, 2023 · 6f448ed · 6f448ed
2 parents e836b1e + 06d4c72
commit 6f448ed
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/agent/local/state.go b/agent/local/state.go
@@ -834,6 +834,12 @@ func (l *State) setCheckStateLocked(c *CheckState) {
 	existing := l.checks[id]
 	if existing != nil {
 		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