Merge pull request #9543 from ErikDubbelboer/racefix

Removed race condition
Upstream-commit: f91a79e071db20e45fa61e0f606ce944121822c4
Component: engine

components/engine/pkg/signal/trap.go

@@ -34,9 +34,8 @@ func Trap(cleanup func()) {
 				case os.Interrupt, syscall.SIGTERM:
 					// If the user really wants to interrupt, let him do so.
 					if atomic.LoadUint32(&interruptCount) < 3 {
-						atomic.AddUint32(&interruptCount, 1)
 						// Initiate the cleanup only once
-						if atomic.LoadUint32(&interruptCount) == 1 {
+						if atomic.AddUint32(&interruptCount, 1) == 1 {
 							// Call cleanup handler
 							cleanup()
 							os.Exit(0)