External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 04:29:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixing wsrelay connection loop (#14692)

Browse Source 
* Fixing wsrelay connection loop

* The loop was being interrupted when reaching the return statements, causing a race condition that would make nodes remain disconnected from their websockets
* Added log messages for the previous return state to improve the logging from this state.

* Added logging for malformed payload

* Update awx/main/wsrelay.py

Co-authored-by: Rick Elrod <rick@elrod.me>

* Moved logmsg outside condition

---------

Co-authored-by: Lucas Benedito <lbenedit@redhat.com>
Co-authored-by: Rick Elrod <rick@elrod.me>
This commit is contained in:
lucas-benedito
2023-12-04 14:33:05 +00:00
committed by GitHub
parent 478e2cb28d
commit fb04e5d9f6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/wsrelay.py
View File

@@ -227,7 +227,8 @@ class WebSocketRelayManager(object):
continue continue
try: try:
if not notif.payload or notif.channel != "web_ws_heartbeat": if not notif.payload or notif.channel != "web_ws_heartbeat":
return logger.warning(f"Unexpected channel or missing payload. {notif.channel}, {notif.payload}")
continue
try: try:
payload = json.loads(notif.payload) payload = json.loads(notif.payload)
@@ -235,13 +236,15 @@ class WebSocketRelayManager(object):
logmsg = "Failed to decode message from pg_notify channel `web_ws_heartbeat`" logmsg = "Failed to decode message from pg_notify channel `web_ws_heartbeat`"
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logmsg = "{} {}".format(logmsg, payload) logmsg = "{} {}".format(logmsg, payload)
logger.warning(logmsg) logger.warning(logmsg)
return continue
# Skip if the message comes from the same host we are running on # Skip if the message comes from the same host we are running on
# In this case, we'll be sharing a redis, no need to relay. # In this case, we'll be sharing a redis, no need to relay.
if payload.get("hostname") == self.local_hostname: if payload.get("hostname") == self.local_hostname:
return hostname = payload.get("hostname")
logger.debug("Received a heartbeat request for {hostname}. Skipping as we use redis for local host.")
continue
action = payload.get("action") action = payload.get("action")
@@ -250,7 +253,7 @@ class WebSocketRelayManager(object):
ip = payload.get("ip") or hostname # try back to hostname if ip isn't supplied ip = payload.get("ip") or hostname # try back to hostname if ip isn't supplied
if ip is None: if ip is None:
logger.warning(f"Received invalid {action} ws_heartbeat, missing hostname and ip: {payload}") logger.warning(f"Received invalid {action} ws_heartbeat, missing hostname and ip: {payload}")
return continue
logger.debug(f"Web host {hostname} ({ip}) {action} heartbeat received.") logger.debug(f"Web host {hostname} ({ip}) {action} heartbeat received.")
if action == "online": if action == "online":