From 06bfe2b96c4c97a9505f5164d826cea987763c6a Mon Sep 17 00:00:00 2001 From: Zhihong Zhang Date: Wed, 4 Sep 2024 18:39:04 -0400 Subject: [PATCH 1/2] Added debug info for memoryview errors --- nvflare/fuel/f3/streaming/blob_streamer.py | 15 ++++++++++----- nvflare/private/aux_runner.py | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/nvflare/fuel/f3/streaming/blob_streamer.py b/nvflare/fuel/f3/streaming/blob_streamer.py index 53a7075981..85cf3842a9 100644 --- a/nvflare/fuel/f3/streaming/blob_streamer.py +++ b/nvflare/fuel/f3/streaming/blob_streamer.py @@ -109,10 +109,15 @@ def _read_stream(blob_task: BlobTask): break length = len(buf) - if blob_task.pre_allocated: - blob_task.buffer[buf_size : buf_size + length] = buf - else: - blob_task.buffer.append(buf) + try: + if blob_task.pre_allocated: + blob_task.buffer[buf_size : buf_size + length] = buf + else: + blob_task.buffer.append(buf) + except Exception as ex: + log.error(f"memory view error: {ex} " + f"Debug info: {length=} {buf_size=} {len(blob_task.pre_allocated)=} {type(buf)=}") + raise ex buf_size += length @@ -129,7 +134,7 @@ def _read_stream(blob_task: BlobTask): blob_task.future.set_result(result) except Exception as ex: log.error(f"Stream {blob_task.future.get_stream_id()} read error: {ex}") - log.debug(secure_format_traceback()) + log.error(secure_format_traceback()) blob_task.future.set_exception(ex) diff --git a/nvflare/private/aux_runner.py b/nvflare/private/aux_runner.py index be7bc8d436..a808652d10 100644 --- a/nvflare/private/aux_runner.py +++ b/nvflare/private/aux_runner.py @@ -132,6 +132,11 @@ def dispatch(self, topic: str, request: Shareable, fl_ctx: FLContext) -> Shareab Returns: reply message """ + + if not isinstance(request, Shareable): + self.log_error(fl_ctx, f"received invalid aux request: expects a Shareable but got {type(request)}") + return make_reply(ReturnCode.BAD_REQUEST_DATA) + peer_props = request.get_peer_props() if peer_props: peer_ctx = FLContext() From 503ad0037213565a211b034b49bc0ea3897a3cf5 Mon Sep 17 00:00:00 2001 From: Zhihong Zhang Date: Wed, 4 Sep 2024 18:55:15 -0400 Subject: [PATCH 2/2] Fixed formatting issues --- nvflare/fuel/f3/streaming/blob_streamer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nvflare/fuel/f3/streaming/blob_streamer.py b/nvflare/fuel/f3/streaming/blob_streamer.py index 85cf3842a9..e3ba9ab11c 100644 --- a/nvflare/fuel/f3/streaming/blob_streamer.py +++ b/nvflare/fuel/f3/streaming/blob_streamer.py @@ -115,8 +115,10 @@ def _read_stream(blob_task: BlobTask): else: blob_task.buffer.append(buf) except Exception as ex: - log.error(f"memory view error: {ex} " - f"Debug info: {length=} {buf_size=} {len(blob_task.pre_allocated)=} {type(buf)=}") + log.error( + f"memory view error: {ex} " + f"Debug info: {length=} {buf_size=} {len(blob_task.pre_allocated)=} {type(buf)=}" + ) raise ex buf_size += length