Skip to content

Added origin to the stream lookup key #4032

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

Open
nvidianz wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Added origin to the stream lookup key #4032

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8369065
Added origin to the stream lookup key
nvidianz Jan 23, 2026
e1b6ee3
Added stream_utils_test.py
nvidianz Jan 24, 2026
ae5df3e
Changed process start method to spawn
nvidianz Jan 24, 2026
1dea7ad
Merge branch 'main' into add_origin_in_stream_matching
nvidianz Jan 24, 2026
0b66ae1
Removed multi-process tests
nvidianz Jan 24, 2026
165122c
Merge branch 'main' into add_origin_in_stream_matching
chesterxgchen Jan 27, 2026
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: 4 additions & 4 deletions nvflare/fuel/f3/streaming/byte_receiver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
class RxTask:
"""Receiving task for ByteStream"""

rx_task_map = {}
rx_task_map: Dict[Tuple[str, int], "RxTask"] = {}
map_lock = threading.Lock()

def __init__(self, sid: int, origin: str, cell: CoreCell):
Expand Down Expand Up @@ -94,14 +94,14 @@ def find_or_create_task(cls, message: Message, cell: CoreCell) -> Optional["RxTa
error = message.get_header(StreamHeaderKey.ERROR_MSG, None)

with cls.map_lock:
task = cls.rx_task_map.get(sid, None)
task = cls.rx_task_map.get((origin, sid), None)
if not task:
if error:
log.warning(f"Received error for non-existing stream: SID {sid} from {origin}")
return None

task = RxTask(sid, origin, cell)
cls.rx_task_map[sid] = task
cls.rx_task_map[(origin, sid)] = task
else:
if error:
task.stop(StreamError(f"{task} Received error from {origin}: {error}"), notify=False)
Expand Down Expand Up @@ -195,7 +195,7 @@ def _handle_incoming_data(self, seq: int, message: Message):
def stop(self, error: StreamError = None, notify=True):

with RxTask.map_lock:
RxTask.rx_task_map.pop(self.sid, None)
RxTask.rx_task_map.pop((self.origin, self.sid), None)

if not error:
return
Expand Down
Loading