change order of checks

NVIDIA · Apr 16, 2024 · 5db10d8 · 5db10d8
1 parent 639d298
commit 5db10d8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/nvflare/app_common/ccwf/server_ctl.py b/nvflare/app_common/ccwf/server_ctl.py
@@ -345,9 +345,7 @@ def control_flow(self, abort_signal: Signal, fl_ctx: FLContext):
 
     def handle_event(self, event_type: str, fl_ctx: FLContext):
         if event_type == EventType.BEFORE_PROCESS_TASK_REQUEST:
-            peer_ctx = fl_ctx.get_peer_context()
-            if peer_ctx and self.workflow_id in peer_ctx.get_prop(Constant.STATUS_REPORTS, {}):
-                self._update_client_status(fl_ctx)
+            self._update_client_status(fl_ctx)
 
     def process_config_reply(self, client_name: str, reply: Shareable, fl_ctx: FLContext) -> bool:
         return True
@@ -441,10 +439,8 @@ def _check_job_status(self, fl_ctx: FLContext):
     def _update_client_status(self, fl_ctx: FLContext):
         peer_ctx = fl_ctx.get_peer_context()
         assert isinstance(peer_ctx, FLContext)
+
         client_name = peer_ctx.get_identity_name()
-        if client_name not in self.client_statuses:
-            self.log_error(fl_ctx, f"received result from unknown client {client_name}!")
-            return
 
         # see whether status is available
         reports = peer_ctx.get_prop(Constant.STATUS_REPORTS)
@@ -456,6 +452,10 @@ def _update_client_status(self, fl_ctx: FLContext):
         if not my_report:
             return
 
+        if client_name not in self.client_statuses:
+            self.log_error(fl_ctx, f"received result from unknown client {client_name}!")
+            return
+
         report = status_report_from_dict(my_report)
         cs = self.client_statuses[client_name]
         assert isinstance(cs, ClientStatus)