Skip to content

Commit ec9bced

Browse files
committed
Prefer reload to restart for HAProxy
The DFaaS agent restarts the HAProxy by issuing `systemctl restart haproxy.service`, this causes a hard stop of the HAProxy, closing all open connections and losing requests. The solution is to issue `systemctl reload haproxy.service`, this will instruct HAProxy to do a graceful stop when restarting. The latter will not close any open connections and the restart mechanism without loss of requests is automatically done by HAProxy in master-worker mode (the default on Ubuntu).
1 parent 44c8a52 commit ec9bced

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

dfaasagent.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AGENT_RECALC_PERIOD=1m
2020
AGENT_HAPROXY_TEMPLATE_FILE_NMS="/agent/haproxycfgnms.tmpl"
2121
AGENT_HAPROXY_TEMPLATE_FILE_RECALC="/agent/haproxycfgrecalc.tmpl"
2222
AGENT_HAPROXY_CONFIG_FILE="/etc/haproxy/haproxy.cfg"
23-
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl restart haproxy.service"
23+
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl reload haproxy.service"
2424
AGENT_HAPROXY_HOST=127.0.0.1
2525
AGENT_HAPROXY_PORT=80
2626
AGENT_HAPROXY_SOCK_PATH="unix:///run/haproxy/admin.sock"
@@ -47,4 +47,4 @@ AGENT_NODE_TYPE=1 # heavy=0 mid=1 light=2
4747

4848
AGENT_NMS_CPU_THRESHOLD=120.0 # max cpu usage percentage
4949
AGENT_NMS_RAM_THRESHOLD=5500000000.0 # max ram usage in bytes
50-
AGENT_NMS_POWER_THRESHOLD=2100000.0 # max power usage in microwatts
50+
AGENT_NMS_POWER_THRESHOLD=2100000.0 # max power usage in microwatts

test_environment/dfaasagent-heavy.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AGENT_RECALC_PERIOD=1m
2020
AGENT_HAPROXY_TEMPLATE_FILE_NMS="/agent/haproxycfgnms.tmpl"
2121
AGENT_HAPROXY_TEMPLATE_FILE_RECALC="/agent/haproxycfgrecalc.tmpl"
2222
AGENT_HAPROXY_CONFIG_FILE="/etc/haproxy/haproxy.cfg"
23-
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl restart haproxy.service"
23+
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl reload haproxy.service"
2424
AGENT_HAPROXY_HOST=172.16.238.12
2525
AGENT_HAPROXY_PORT=80
2626
AGENT_HAPROXY_SOCK_PATH="unix:///run/haproxy/admin.sock"
@@ -47,4 +47,4 @@ AGENT_NODE_TYPE=0 # heavy=0 mid=1 light=2
4747

4848
AGENT_NMS_CPU_THRESHOLD=235.0 # max cpu usage percentage
4949
AGENT_NMS_RAM_THRESHOLD=6000000000.0 # max ram usage in bytes
50-
AGENT_NMS_POWER_THRESHOLD=3500000.0 # max power usage in microwatts
50+
AGENT_NMS_POWER_THRESHOLD=3500000.0 # max power usage in microwatts

test_environment/dfaasagent-light.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AGENT_RECALC_PERIOD=1m
2020
AGENT_HAPROXY_TEMPLATE_FILE_NMS="/agent/haproxycfgnms.tmpl"
2121
AGENT_HAPROXY_TEMPLATE_FILE_RECALC="/agent/haproxycfgrecalc.tmpl"
2222
AGENT_HAPROXY_CONFIG_FILE="/etc/haproxy/haproxy.cfg"
23-
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl restart haproxy.service"
23+
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl reload haproxy.service"
2424
AGENT_HAPROXY_HOST=172.16.238.10
2525
AGENT_HAPROXY_PORT=80
2626
AGENT_HAPROXY_SOCK_PATH="unix:///run/haproxy/admin.sock"
@@ -47,4 +47,4 @@ AGENT_NODE_TYPE=2 # heavy=0 mid=1 light=2
4747

4848
AGENT_NMS_CPU_THRESHOLD=104.0 # max cpu usage percentage
4949
AGENT_NMS_RAM_THRESHOLD=4100000000.0 # max ram usage in bytes
50-
AGENT_NMS_POWER_THRESHOLD=700000.0 # max power usage in microwatts
50+
AGENT_NMS_POWER_THRESHOLD=700000.0 # max power usage in microwatts

test_environment/dfaasagent-mid.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AGENT_RECALC_PERIOD=1m
2020
AGENT_HAPROXY_TEMPLATE_FILE_NMS="/agent/haproxycfgnms.tmpl"
2121
AGENT_HAPROXY_TEMPLATE_FILE_RECALC="/agent/haproxycfgrecalc.tmpl"
2222
AGENT_HAPROXY_CONFIG_FILE="/etc/haproxy/haproxy.cfg"
23-
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl restart haproxy.service"
23+
AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl reload haproxy.service"
2424
AGENT_HAPROXY_HOST=172.16.238.11
2525
AGENT_HAPROXY_PORT=80
2626
AGENT_HAPROXY_SOCK_PATH="unix:///run/haproxy/admin.sock"
@@ -47,4 +47,4 @@ AGENT_NODE_TYPE=1 # heavy=0 mid=1 light=2
4747

4848
AGENT_NMS_CPU_THRESHOLD=190.0 # max cpu usage percentage
4949
AGENT_NMS_RAM_THRESHOLD=5500000000.0 # max ram usage in bytes
50-
AGENT_NMS_POWER_THRESHOLD=2100000.0 # max power usage in microwatts
50+
AGENT_NMS_POWER_THRESHOLD=2100000.0 # max power usage in microwatts

0 commit comments

Comments
 (0)