Skip to content

Commit fca0474

Browse files
committed
🐛 Server state change command
Signed-off-by: Muhammed Hussein Karimi <[email protected]>
1 parent 0514ac8 commit fca0474

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

charts/haproxy-redis-sentinel/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: haproxy-redis-sentinel
33
description: A Helm chart for HAProxy with Redis Sentinel
4-
version: 0.0.16
5-
appVersion: "0.0.9"
4+
version: 0.0.17
5+
appVersion: "0.0.10"
66
sources:
77
- https://github.com/ParminCloud/haproxy-redis-sentinel
88
maintainers:

haproxy_redis_sentinel/cli.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,22 @@ def run(
9494
address = None
9595
sentinel_info: dict[str, Any] = conn.info() # type: ignore
9696
try:
97-
master_id = [k for k in sentinel_info.keys()
98-
if k.startswith("master") and
99-
sentinel_info[k]["name"] == master_name][0]
97+
master_id = [
98+
k for k in sentinel_info.keys()
99+
if k.startswith("master") and
100+
sentinel_info[k]["name"] == master_name
101+
][0]
100102
except IndexError:
101103
raise Exception("Unable to find given master by name")
102104
address = sentinel_info[master_id]["address"]
103105
info(f"Setting initial master address: {address}")
104106

105107
# Remove server in case of restarts
106108
out = send_command(haproxy_socket, [
107-
f"set server {
108-
haproxy_backend}/{haproxy_server_name} state maint",
109-
f"del server {haproxy_backend}/{haproxy_server_name}"])
109+
f"set server {haproxy_backend}/{haproxy_server_name} state maint",
110+
f"shutdown sessions server {haproxy_backend}/{haproxy_server_name}",
111+
f"del server {haproxy_backend}/{haproxy_server_name}",
112+
])
110113
if len(out) > 0 and \
111114
not any(item in out for item in {HAProxyOutput.SERVER_DELETED,
112115
HAProxyOutput.SERVER_NOT_FOUND,
@@ -132,9 +135,12 @@ def run(
132135
host = data[3]
133136
port = data[4]
134137
info("Master Changed, Terminating clients")
135-
info(send_command(haproxy_socket,
136-
[f"set server {haproxy_backend}/{haproxy_server_name} state maint", # noqa: E501
137-
f"shutdown sessions server {haproxy_backend}/{haproxy_server_name}"])) # noqa: E501
138+
info(send_command(haproxy_socket, [
139+
f"set server {haproxy_backend}/{haproxy_server_name} state maint", # noqa: E501
140+
f"shutdown sessions server {haproxy_backend}/{haproxy_server_name}", # noqa: E501
141+
]))
138142
info(f"Switching to new master Host: {host}, Port: {port}")
139-
info(send_command(haproxy_socket,
140-
f"set server {haproxy_backend}/{haproxy_server_name} addr {host} port {port} state ready")) # noqa: E501
143+
info(send_command(haproxy_socket, [
144+
f"set server {haproxy_backend}/{haproxy_server_name} addr {host} port {port}", # noqa: E501
145+
f"set server {haproxy_backend}/{haproxy_server_name} state ready", # noqa: E501
146+
]))

0 commit comments

Comments
 (0)