Merge pull request openshift#707 from runcom/update-lock

pkg/daemon: lock when checking if update is active
cgwalters · May 6, 2019 · 247b58e · 247b58e
2 parents a2c37de + f17b95b
commit 247b58e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -14,6 +14,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 
@@ -90,7 +91,8 @@ type Daemon struct {
 	kubeletHealthzEnabled  bool
 	kubeletHealthzEndpoint string
 
-	updateActive bool
+	updateActive     bool
+	updateActiveLock sync.Mutex
 
 	nodeWriter NodeWriter
 
@@ -481,7 +483,10 @@ func (dn *Daemon) InstallSignalHandler(signaled chan struct{}) {
 		for sig := range termChan {
 			switch sig {
 			case syscall.SIGTERM:
-				if dn.updateActive {
+				dn.updateActiveLock.Lock()
+				updateActive := dn.updateActive
+				dn.updateActiveLock.Unlock()
+				if updateActive {
 					glog.Info("Got SIGTERM, but actively updating")
 				} else {
 					close(signaled)

diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
@@ -730,13 +730,17 @@ func (dn *Daemon) logSystem(format string, a ...interface{}) {
 }
 
 func (dn *Daemon) catchIgnoreSIGTERM() {
+	dn.updateActiveLock.Lock()
+	defer dn.updateActiveLock.Unlock()
 	if dn.updateActive {
 		return
 	}
 	dn.updateActive = true
 }
 
 func (dn *Daemon) cancelSIGTERM() {
+	dn.updateActiveLock.Lock()
+	defer dn.updateActiveLock.Unlock()
 	if dn.updateActive {
 		dn.updateActive = false
 	}