Skip to content

Commit 213c160

Browse files
committed
CLEANUP/MINOR: remove server state save
this is not needed since we write data to haproxy.cfg file that is read during reload
1 parent 9a81850 commit 213c160

File tree

4 files changed

+0
-36
lines changed

4 files changed

+0
-36
lines changed

pkg/haproxy/env/defaults.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
1212
global.MasterWorker = true
1313
global.Pidfile = env.PIDFile
1414
global.Localpeer = "local"
15-
global.ServerStateBase = env.StateDir
16-
global.ServerStateFile = "global"
1715
runtimeAPIs := []*models.RuntimeAPI{}
1816
if env.RuntimeSocket != "" {
1917
runtimeAPIs = append(runtimeAPIs, &models.RuntimeAPI{
@@ -73,7 +71,6 @@ func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
7371
func SetDefaults(defaults *models.Defaults) {
7472
// Enforced values
7573
// Logging is enforced in DefaultsPushConfiguration method
76-
defaults.LoadServerStateFromFile = "global"
7774

7875
// Default values
7976
enabled := "enabled"

pkg/haproxy/process/direct-control.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,12 @@ func (d *directControl) Service(action string) (err error) {
5454
_, err = process.Wait()
5555
return err
5656
case "reload":
57-
logger.Error(saveServerState(d.Env.StateDir, d.API))
5857
if processErr != nil {
5958
logger.Errorf("haproxy is not running, trying to start it")
6059
return d.Service("start")
6160
}
6261
return process.Signal(syscall.SIGUSR2)
6362
case "restart":
64-
logger.Error(saveServerState(d.Env.StateDir, d.API))
6563
if processErr != nil {
6664
logger.Errorf("haproxy is not running, trying to start it")
6765
return d.Service("start")

pkg/haproxy/process/interface.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ package process
33
import (
44
"bufio"
55
"os"
6-
"path/filepath"
76
"strconv"
87
"syscall"
98

10-
"github.com/haproxytech/client-native/v3/runtime"
119
"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/api"
1210
"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/env"
1311
"github.com/haproxytech/kubernetes-ingress/pkg/utils"
@@ -62,30 +60,3 @@ func haproxyProcess(pidFile string) (*os.Process, error) {
6260
err = process.Signal(syscall.Signal(0))
6361
return process, err
6462
}
65-
66-
// Saves HAProxy servers state so it is retrieved after reload.
67-
func saveServerState(stateDir string, api runtime.Raw) error {
68-
result, err := api.ExecuteRaw("show servers state")
69-
if err != nil {
70-
return err
71-
}
72-
var f *os.File
73-
if f, err = os.Create(filepath.Join(stateDir, "global")); err != nil {
74-
logger.Error(err)
75-
return err
76-
}
77-
defer f.Close()
78-
if _, err = f.Write([]byte(result[0])); err != nil {
79-
logger.Error(err)
80-
return err
81-
}
82-
if err = f.Sync(); err != nil {
83-
logger.Error(err)
84-
return err
85-
}
86-
if err = f.Close(); err != nil {
87-
logger.Error(err)
88-
return err
89-
}
90-
return nil
91-
}

pkg/haproxy/process/s6-overlay.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ func (d *s6Control) Service(action string) error {
3131
// no need to stop it (s6)
3232
return nil
3333
case "reload":
34-
logger.Error(saveServerState(d.Env.StateDir, d.API))
3534
cmd = exec.Command("s6-svc", "-2", "/var/run/s6/services/haproxy")
3635
cmd.Stdout = os.Stdout
3736
cmd.Stderr = os.Stderr
3837
return cmd.Run()
3938
case "restart":
40-
logger.Error(saveServerState(d.Env.StateDir, d.API))
4139
// -t terminates and s6 will start it again
4240
cmd = exec.Command("s6-svc", "-t", "/var/run/s6/services/haproxy")
4341
cmd.Stdout = os.Stdout

0 commit comments

Comments
 (0)