xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-11 02:22:31 +00:00
Code Issues Projects Releases Wiki Activity

Validate that the agent socket actually works

Browse Source 
If agent is 'kill -9', then recover
from that by reaping the now dead socket.
This commit is contained in:
Jarrod Johnson
2025-08-26 14:00:36 -04:00
parent 710b24e9f5
commit 595b628e08
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
confluent_server/confluent/sshutil.py
View File

@@ -5,6 +5,7 @@ import confluent.config.configmanager as cfm
import confluent.collective.manager as collective
import confluent.util as util
import eventlet.green.subprocess as subprocess
import eventlet.green.socket as socket
import eventlet
import glob
import eventlet.green.os as os
@@ -119,6 +120,15 @@ def prep_ssh_key(keyname):
eventlet.sleep(0.1)
adding_key = True
if agent_pid:
if os.path.exists(os.environ['SSH_AUTH_SOCK']):
try:
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sock.connect(os.environ['SSH_AUTH_SOCK'])
except Exception:
os.unlink(os.environ['SSH_AUTH_SOCK'])
os.rmdir(os.path.dirname(os.environ['SSH_AUTH_SOCK']))
finally:
sock.close()
if not os.path.exists(os.environ['SSH_AUTH_SOCK']):
agent_pid = None
ready_keys.clear()