[Bugfix] Fix memory leak: missing chunk_transfer_adapter.cleanup() in OmniARScheduler (#2028)
Signed-off-by: dubin555 <dubin555@gmail.com> Signed-off-by: OSS Scout <scout@oss-scout.local>
This commit is contained in:
1 parent
e7e05a55cf
commit
69652a2983
2 files changed
+45
-25
No files matched your search
@@ -302,6 +302,10 @@ class OmniARScheduler(VLLMScheduler):
|
||||
finished = self._handle_stopped_request(request)
|
||||
if finished:
|
||||
kv_transfer_params = self._free_request(request)
|
||||
if self.chunk_transfer_adapter is not None:
|
||||
self.chunk_transfer_adapter.cleanup_receiver(
|
||||
request.request_id,
|
||||
)
|
||||
if status_before_stop == RequestStatus.RUNNING:
|
||||
stopped_running_reqs.add(request)
|
||||
elif status_before_stop == RequestStatus.WAITING_FOR_CHUNK:
|
||||
@@ -383,9 +387,8 @@ class OmniARScheduler(VLLMScheduler):
|
||||
)
|
||||
)
|
||||
if self.chunk_transfer_adapter is not None:
|
||||
self.chunk_transfer_adapter.cleanup(
|
||||
self.chunk_transfer_adapter.cleanup_receiver(
|
||||
request.request_id,
|
||||
getattr(request, "external_req_id", None),
|
||||
)
|
||||
|
||||
# [Omni] Cleanup state for finished requests
|
||||
|
||||
@@ -210,9 +210,9 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
is_finished = task["is_finished"]
|
||||
stage_id = self.connector.stage_id
|
||||
next_stage_id = stage_id + 1
|
||||
request_id = request.external_req_id
|
||||
chunk_id = self.put_req_chunk[request_id]
|
||||
connector_put_key = f"{request_id}_{stage_id}_{chunk_id}"
|
||||
external_req_id = request.external_req_id
|
||||
chunk_id = self.put_req_chunk[external_req_id]
|
||||
connector_put_key = f"{external_req_id}_{stage_id}_{chunk_id}"
|
||||
# Process payload in save_loop thread
|
||||
payload_data = None
|
||||
if self.custom_process_next_stage_input_func:
|
||||
@@ -238,19 +238,49 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
)
|
||||
|
||||
if success:
|
||||
self.put_req_chunk[request_id] += 1
|
||||
self.put_req_chunk[external_req_id] += 1
|
||||
logger.debug(f"[Stage-{stage_id}] Sent {connector_put_key}")
|
||||
|
||||
if is_finished:
|
||||
self.code_prompt_token_ids.pop(request_id, None)
|
||||
cached_ic = getattr(self, "_cached_ic", None)
|
||||
if cached_ic is not None:
|
||||
cached_ic.pop(request_id, None)
|
||||
self.cleanup_sender(external_req_id)
|
||||
|
||||
########################################################################
|
||||
# Cleanup
|
||||
########################################################################
|
||||
|
||||
def cleanup_receiver(self, request_id: str) -> None:
|
||||
"""Reclaim receiver-side per-request state (keyed by internal id).
|
||||
|
||||
Safe to call from the scheduler even when ``save_async()`` has
|
||||
enqueued work that the background thread has not yet processed,
|
||||
because it only touches receiver-side dictionaries.
|
||||
|
||||
Idempotent: calling with an already-cleaned or unknown id is safe.
|
||||
"""
|
||||
self.finished_requests.discard(request_id)
|
||||
self.get_req_chunk.pop(request_id, None)
|
||||
self.requests_with_ready_chunks.discard(request_id)
|
||||
self.request_ids_mapping.pop(request_id, None)
|
||||
|
||||
self._cancelled_load_reqs.add(request_id)
|
||||
self._finished_load_reqs.discard(request_id)
|
||||
|
||||
def cleanup_sender(self, external_req_id: str) -> None:
|
||||
"""Reclaim sender-side per-request state (keyed by external id).
|
||||
|
||||
Must only be called after the terminal chunk has actually been
|
||||
sent (i.e. from ``_send_single_request``), not before.
|
||||
|
||||
Idempotent: calling with an already-cleaned or unknown id is safe.
|
||||
"""
|
||||
self.put_req_chunk.pop(external_req_id, None)
|
||||
self.request_payload.pop(external_req_id, None)
|
||||
self.code_prompt_token_ids.pop(external_req_id, None)
|
||||
|
||||
cached_ic = getattr(self, "_cached_ic", None)
|
||||
if cached_ic is not None:
|
||||
cached_ic.pop(external_req_id, None)
|
||||
|
||||
def cleanup(
|
||||
self,
|
||||
request_id: str,
|
||||
@@ -268,21 +298,8 @@ class OmniChunkTransferAdapter(OmniTransferAdapterBase):
|
||||
if external_req_id is None:
|
||||
external_req_id = self.request_ids_mapping.get(request_id, request_id)
|
||||
|
||||
self.finished_requests.discard(request_id)
|
||||
self.get_req_chunk.pop(request_id, None)
|
||||
self.requests_with_ready_chunks.discard(request_id)
|
||||
self.request_ids_mapping.pop(request_id, None)
|
||||
|
||||
self._cancelled_load_reqs.add(request_id)
|
||||
self._finished_load_reqs.discard(request_id)
|
||||
|
||||
self.put_req_chunk.pop(external_req_id, None)
|
||||
self.request_payload.pop(external_req_id, None)
|
||||
self.code_prompt_token_ids.pop(external_req_id, None)
|
||||
|
||||
cached_ic = getattr(self, "_cached_ic", None)
|
||||
if cached_ic is not None:
|
||||
cached_ic.pop(external_req_id, None)
|
||||
self.cleanup_receiver(request_id)
|
||||
self.cleanup_sender(external_req_id)
|
||||
|
||||
########################################################################
|
||||
# Schedule Helper
|
||||
|
||||
Reference in new issue
Block a user