software-engineering/spark-vllm-docker
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #62

Browse Source
This commit is contained in:
Eugene Rakhmatulin
2026-02-26 15:24:42 -08:00
parent 4593931421 c1c3b9d66a
commit 15888c407a
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
launch-cluster.sh
View File

@@ -119,17 +119,8 @@ while [[ "$#" -gt 0 ]]; do
break break
;; ;;
*) *)
# If it's not a flag and not a known action, treat as exec command for backward compatibility echo "Error: Unknown argument or action: $1"
# unless it's the default 'start' implied. usage
# However, to support "omitted" = start, we need to be careful.
# If the arg looks like a command, it's exec.
if [[ -n "$LAUNCH_SCRIPT_PATH" ]]; then
echo "Error: Command is not compatible with --launch-script. Please omit the command or not use --launch-script."
exit 1
fi
ACTION="exec"
COMMAND_TO_RUN="$@"
break
;; ;;
esac esac
shift shift
@@ -405,8 +396,8 @@ if [[ "$ACTION" == "status" ]]; then
fi fi
# Trap signals # Trap signals
# Only trap if we are NOT in daemon mode, OR if we are in exec mode (always cleanup after exec) # Only trap if we are NOT in daemon mode (container should persist in daemon mode)
if [[ "$DAEMON_MODE" == "false" ]] || [[ "$ACTION" == "exec" ]]; then if [[ "$DAEMON_MODE" == "false" ]]; then
trap cleanup EXIT INT TERM HUP trap cleanup EXIT INT TERM HUP
fi fi
@@ -698,15 +689,22 @@ wait_for_cluster() {
if [[ "$ACTION" == "exec" ]]; then if [[ "$ACTION" == "exec" ]]; then
start_cluster start_cluster
echo "Executing command on head node: $COMMAND_TO_RUN" echo "Executing command on head node: $COMMAND_TO_RUN"
# Check if running in a TTY to avoid "input device is not a TTY" error if [[ "$DAEMON_MODE" == "true" ]]; then
if [ -t 0 ]; then # Daemon mode: run command detached inside the container and exit immediately
DOCKER_EXEC_FLAGS="-it" # Extract env vars starting from VLLM_HOST_IP to avoid interactive check in .bashrc
docker exec -d "$CONTAINER_NAME" bash -c "eval \"\$(sed -n '/export VLLM_HOST_IP/,\$p' /root/.bashrc)\" && $COMMAND_TO_RUN"
echo "Command dispatched in background (Daemon mode). Container: $CONTAINER_NAME"
else else
DOCKER_EXEC_FLAGS="-i" # Check if running in a TTY to avoid "input device is not a TTY" error
if [ -t 0 ]; then
DOCKER_EXEC_FLAGS="-it"
else
DOCKER_EXEC_FLAGS="-i"
fi
docker exec $DOCKER_EXEC_FLAGS "$CONTAINER_NAME" bash -i -c "$COMMAND_TO_RUN"
fi fi
docker exec $DOCKER_EXEC_FLAGS "$CONTAINER_NAME" bash -i -c "$COMMAND_TO_RUN"
elif [[ "$ACTION" == "start" ]]; then elif [[ "$ACTION" == "start" ]]; then
start_cluster start_cluster
if [[ "$DAEMON_MODE" == "true" ]]; then if [[ "$DAEMON_MODE" == "true" ]]; then