Skip to content

[BugFix] Fix multi async save in MultiConnector #18246

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

Merged
merged 1 commit into from
May 16, 2025
Merged

[BugFix] Fix multi async save in MultiConnector #18246

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
23 changes: 17 additions & 6 deletions vllm/distributed/kv_transfer/kv_connector/v1/multi_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
import copy
from dataclasses import dataclass
from typing import TYPE_CHECKING, Any, Optional

import torch
Expand All @@ -21,9 +22,10 @@
logger = init_logger(__name__)


class MultiKVConnectorMetadata(tuple[KVConnectorMetadata, ...],
KVConnectorMetadata):
pass
@dataclass
class MultiKVConnectorMetadata(KVConnectorMetadata):
metadata: tuple[KVConnectorMetadata, ...]
extra_async_saves: Optional[dict[str, int]] = None


class MultiConnector(KVConnectorBase_V1):
Expand Down Expand Up @@ -54,6 +56,7 @@ def __init__(self, vllm_config: "VllmConfig", role: KVConnectorRole):
# Keeps track of *additional* remaining async saves (beyond 1) to be
# finished per request. Not needed for async loads since we only allow
# a single connector to load.
# Propagated from scheduler to worker side via the connector metadata.
self._extra_async_saves: dict[str, int] = {}

def register_kv_caches(self, kv_caches: dict[str, torch.Tensor]):
Expand All @@ -66,7 +69,10 @@ def register_kv_caches(self, kv_caches: dict[str, torch.Tensor]):
def bind_connector_metadata(
self, connector_metadata: KVConnectorMetadata) -> None:
assert isinstance(connector_metadata, MultiKVConnectorMetadata)
for c, cm in zip(self._connectors, connector_metadata):
if connector_metadata.extra_async_saves:
self._extra_async_saves.update(
connector_metadata.extra_async_saves)
for c, cm in zip(self._connectors, connector_metadata.metadata):
c.bind_connector_metadata(cm)

def clear_connector_metadata(self) -> None:
Expand Down Expand Up @@ -152,8 +158,13 @@ def update_state_after_alloc(self, request: "Request",
def build_connector_meta(
self,
scheduler_output: SchedulerOutput) -> MultiKVConnectorMetadata:
return MultiKVConnectorMetadata(
c.build_connector_meta(scheduler_output) for c in self._connectors)
metadata = MultiKVConnectorMetadata(metadata=tuple(
c.build_connector_meta(scheduler_output)
for c in self._connectors))
if self._extra_async_saves:
metadata.extra_async_saves = self._extra_async_saves
self._extra_async_saves = {}
return metadata

def request_finished(
self,
Expand Down