Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions vllm/logging_utils/dump_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,23 @@ def dump_engine_exception(config: VllmConfig,
scheduler_stats: Optional[SchedulerStats]):
# NOTE: ensure we can log extra info without risking raises
# unexpected errors during logging
with contextlib.suppress(BaseException):
with contextlib.suppress(Exception):
_dump_engine_exception(config, scheduler_output, scheduler_stats)


def _dump_engine_exception(config: VllmConfig,
scheduler_output: SchedulerOutput,
scheduler_stats: Optional[SchedulerStats]):
logger.error("Dumping input data")

logger.error(
"V1 LLM engine (v%s) with config: %s, ",
"Dumping input data for V1 LLM engine (v%s) with config: %s, ",
VLLM_VERSION,
config,
)

try:
dump_obj = prepare_object_to_dump(scheduler_output)
logger.error("Dumping scheduler output for model execution:")
logger.error(dump_obj)
logger.error("Dumping scheduler output for model execution: %s",
dump_obj)
if scheduler_stats:
logger.error(scheduler_stats)
except BaseException as exception:
logger.error("Error preparing object to dump")
logger.error(repr(exception))
logger.error("Dumping scheduler stats: %s", scheduler_stats)
except Exception:
logger.exception("Error preparing object to dump")
7 changes: 5 additions & 2 deletions vllm/v1/engine/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,14 @@ def abort_requests(self, request_ids: list[str]):
def execute_model(self, scheduler_output: SchedulerOutput):
try:
return self.model_executor.execute_model(scheduler_output)
except BaseException as err:
except Exception as err:
# We do not want to catch BaseException here since we're only
# interested in dumping info when the exception is due to an
# error from execute_model itself.

# NOTE: This method is exception-free
dump_engine_exception(self.vllm_config, scheduler_output,
self.scheduler.make_stats())
# Re-raise exception
raise err

def step(self) -> tuple[dict[int, EngineCoreOutputs], bool]:
Expand Down