ENH: Adds seamless reloads (#19)

docker-flow · May 8, 2018 · 52c0f86 · 52c0f86
1 parent bbb0113
commit 52c0f86
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 1 deletion.
diff --git a/haproxy.cfg b/haproxy.cfg
@@ -1,5 +1,6 @@
 global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
 
 defaults
     mode    http

diff --git a/haproxy.tmpl b/haproxy.tmpl
@@ -1,5 +1,6 @@
 global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
     tune.ssl.default-dh-param 2048{{.ExtraGlobal}}
 
     # disable sslv3, prefer modern ciphers

diff --git a/proxy/ha_proxy.go b/proxy/ha_proxy.go
@@ -165,7 +165,15 @@ func (m HaProxy) Reload() error {
 			return fmt.Errorf("Could not read the %s file\n%s", pidPath, err.Error())
 		}
 		reloadStrategy := m.getReloadStrategy()
-		cmdArgs := []string{reloadStrategy, string(pid)}
+		haproxySocket := "/var/run/haproxy.sock"
+		socketOn := haSocketOn(haproxySocket)
+
+		var cmdArgs []string
+		if socketOn {
+			cmdArgs = []string{"-x", haproxySocket, reloadStrategy, string(pid)}
+		} else {
+			cmdArgs = []string{reloadStrategy, string(pid)}
+		}
 		reloadErr = HaProxy{}.RunCmd(cmdArgs)
 		if reloadErr == nil {
 			logPrintf("Proxy config was reloaded")

diff --git a/proxy/ha_proxy_test.go b/proxy/ha_proxy_test.go
@@ -31,6 +31,7 @@ func TestHaProxyUnitTestSuite(t *testing.T) {
 	s := new(HaProxyTestSuite)
 	s.TemplateContent = `global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
     tune.ssl.default-dh-param 2048
 
     # disable sslv3, prefer modern ciphers
@@ -122,6 +123,9 @@ func (s *HaProxyTestSuite) SetupTest() {
 	readPidFile = func(fileName string) ([]byte, error) {
 		return []byte(s.Pid), nil
 	}
+	haSocketOn = func(adddress string) bool {
+		return true
+	}
 }
 
 // GetCertPaths
@@ -2570,6 +2574,30 @@ func (s *HaProxyTestSuite) Test_Reload_ReturnsError_WhenReadPidFails() {
 	s.Error(err)
 }
 
+func (s *HaProxyTestSuite) Test_HaProxySocketNotOn_RunsRunCmd() {
+	actual := HaProxyTestSuite{}.mockHaExecCmd()
+	haSocketOnOrig := haSocketOn
+	defer func() {
+		haSocketOn = haSocketOnOrig
+	}()
+	haSocketOn = func(address string) bool {
+		return false
+	}
+	expected := []string{
+		"-f",
+		"/cfg/haproxy.cfg",
+		"-D",
+		"-p",
+		"/var/run/haproxy.pid",
+		"-sf",
+		s.Pid,
+	}
+
+	HaProxy{}.Reload()
+
+	s.Equal(expected, *actual)
+}
+
 func (s *HaProxyTestSuite) Test_Reload_RunsRunCmd() {
 	actual := HaProxyTestSuite{}.mockHaExecCmd()
 	expected := []string{
@@ -2578,6 +2606,8 @@ func (s *HaProxyTestSuite) Test_Reload_RunsRunCmd() {
 		"-D",
 		"-p",
 		"/var/run/haproxy.pid",
+		"-x",
+		"/var/run/haproxy.sock",
 		"-sf",
 		s.Pid,
 	}
@@ -2596,6 +2626,8 @@ func (s *HaProxyTestSuite) Test_Reload_Terminate_RunsRunCmd() {
 		"-D",
 		"-p",
 		"/var/run/haproxy.pid",
+		"-x",
+		"/var/run/haproxy.sock",
 		"-st",
 		s.Pid,
 	}

diff --git a/proxy/test_configs/tmpl/haproxy.tmpl b/proxy/test_configs/tmpl/haproxy.tmpl
@@ -1,5 +1,6 @@
 global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
     tune.ssl.default-dh-param 2048{{.ExtraGlobal}}
 
     # disable sslv3, prefer modern ciphers

diff --git a/proxy/util.go b/proxy/util.go
@@ -72,6 +72,11 @@ var readFile = ioutil.ReadFile
 var logPrintf = log.Printf
 var readPidFile = ioutil.ReadFile
 var readConfigsDir = ioutil.ReadDir
+var haSocketOn = func(address string) bool {
+	conn, err := net.Dial("unix", address)
+	defer conn.Close()
+	return err == nil
+}
 var getSecretOrEnvVarSplit = func(key, defaultValue string) string {
 	value := getSecretOrEnvVar(key, defaultValue)
 	if len(value) > 0 {

diff --git a/test_configs/reload-error.cfg b/test_configs/reload-error.cfg
@@ -1,5 +1,6 @@
 global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
     tune.ssl.default-dh-param 2048
 
 defaults

diff --git a/test_configs/reload.cfg b/test_configs/reload.cfg
@@ -1,5 +1,6 @@
 global
     pidfile /var/run/haproxy.pid
+    stats socket /var/run/haproxy.sock mode 660 level admin expose-fd listeners
     tune.ssl.default-dh-param 2048
 
 defaults