BUG/MINOR: restart haproxy when aux config file added

Author: ivanmatmati

controller/controller.go

@@ -148,8 +148,9 @@ func (c *HAProxyController) updateHAProxy() {
 		c.Client.APIDisposeTransaction()
 	}()
 
-	reload, c.restart = c.handleGlobalConfig()
+	reload, restart := c.handleGlobalConfig()
 	c.reload = c.reload || reload
+	c.restart = c.restart || restart
 
 	if len(route.CustomRoutes) != 0 {
 		logger.Error(route.CustomRoutesReset(c.Client))

controller/haproxy.go

@@ -15,6 +15,7 @@
 package controller
 
 import (
+	"os"
 	"os/exec"
 	"strings"
 
@@ -36,11 +37,16 @@ func (c *HAProxyController) haproxyStartup() {
 	} else {
 		logger.Error(err)
 	}
+	var msgAuxConfigFile string
 	if c.OSArgs.UseWiths6Overlay {
 		c.haproxyProcess = process.NewControlOverS6(c.Cfg.Env, c.OSArgs, c.Client)
 	} else {
 		c.haproxyProcess = process.NewDirectControl(c.Cfg.Env, c.OSArgs, c.Client)
+		if _, err := os.Stat(c.Cfg.Env.AuxCFGFile); err == nil {
+			c.haproxyProcess.UseAuxFile(true)
+			msgAuxConfigFile = "and aux config file " + c.Cfg.Env.AuxCFGFile
+		}
 	}
-	logger.Printf("Starting HAProxy with %s", c.Cfg.Env.MainCFGFile)
+	logger.Printf("Starting HAProxy with %s %s", c.Cfg.Env.MainCFGFile, msgAuxConfigFile)
 	logger.Panic(c.haproxyService("start"))
 }

controller/monitor.go

@@ -94,8 +94,8 @@ func (c *HAProxyController) SyncData() {
 		change := false
 		switch job.SyncType {
 		case COMMAND:
-			c.reload = c.auxCfgUpdated()
-			if hadChanges || c.reload {
+			c.restart, c.reload = c.auxCfgManager()
+			if hadChanges || c.reload || c.restart {
 				c.updateHAProxy()
 				hadChanges = false
 				continue
@@ -199,28 +199,52 @@ func (c *HAProxyController) getWhitelistedNamespaces() []string {
 	return namespaces
 }
 
-// auxCfgUpdate returns true if auxiliary HAProxy config file was updated, false otherwise.
-func (c *HAProxyController) auxCfgUpdated() bool {
+// auxCfgManager returns restart or reload requirement based on state and transition of auxiliary configuration file.
+func (c *HAProxyController) auxCfgManager() (restart, reload bool) {
 	info, errStat := os.Stat(c.Cfg.Env.AuxCFGFile)
+	var (
+		modifTime  int64
+		auxCfgFile string = c.Cfg.Env.AuxCFGFile
+		useAuxFile bool
+	)
+
+	defer func() {
+		// Nothing changed
+		if c.AuxCfgModTime == modifTime {
+			return
+		}
+		// Apply decisions
+		c.Client.SetAuxCfgFile(auxCfgFile)
+		c.haproxyProcess.UseAuxFile(useAuxFile)
+		// The file exists now  (modifTime !=0 otherwise nothing changed case).
+		if c.AuxCfgModTime == 0 {
+			restart = true
+		} else {
+			// File already exists,
+			// already in command line parameters just need to reload for modifications.
+			reload = true
+		}
+		c.AuxCfgModTime = modifTime
+		if c.AuxCfgModTime != 0 {
+			logger.Infof("Auxiliary HAProxy config '%s' updated", auxCfgFile)
+		}
+	}()
+
 	// File does not exist
 	if errStat != nil {
+		// nullify it
+		auxCfgFile = ""
 		if c.AuxCfgModTime == 0 {
-			return false
+			// never existed before
+			return
 		}
 		logger.Infof("Auxiliary HAProxy config '%s' removed", c.Cfg.Env.AuxCFGFile)
-		c.AuxCfgModTime = 0
-		c.Client.SetAuxCfgFile("")
-		c.haproxyProcess.UseAuxFile(false)
-		return true
-	}
-	// Check modification time
-	modifTime := info.ModTime().Unix()
-	if c.AuxCfgModTime == modifTime {
-		return false
+		// but existed so need to restart
+		restart = true
+		return
 	}
-	logger.Infof("Auxiliary HAProxy config '%s' updated", c.Cfg.Env.AuxCFGFile)
-	c.AuxCfgModTime = modifTime
-	c.Client.SetAuxCfgFile(c.Cfg.Env.AuxCFGFile)
-	c.haproxyProcess.UseAuxFile(true)
-	return true
+	// File exists
+	useAuxFile = true
+	modifTime = info.ModTime().Unix()
+	return
 }