Skip to content

fix: include PID in ZMQ routing identity for minion/syndic REQ sockets #70140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
waterWang wants to merge 1 commit into from
Closed

fix: include PID in ZMQ routing identity for minion/syndic REQ sockets #70140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion salt/transport/zeromq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,9 +1164,15 @@ def _init_socket(self):
# never reclaims routing-id table entries. On daemon restart
# slots replay in construction order and overwrite the prior
# master-side entries cleanly.
identity = "salt-req/{role}/{minion_id}/{slot}".format(
# Include os.getpid() in the identity so that one-off
# processes (salt-call, salt-run, etc.) that set __role=minion
# never collide with the long-running salt-minion daemon's
# identity slots. Without this, ROUTER_HANDOVER on the master
# silently drops replies still in flight to the original owner.
identity = "salt-req/{role}/{minion_id}/{pid}/{slot}".format(
role=_role,
minion_id=_minion_id,
pid=os.getpid(),
slot=next(_REQ_IDENTITY_SLOT),
)
self.socket.setsockopt(zmq.IDENTITY, identity.encode("utf-8"))
Expand Down