Skip to content

Virt: Fix timeout in run_os_command for Windows operations #3746

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

Open
SiboWang1997 wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −4
Open

Virt: Fix timeout in run_os_command for Windows operations #3746

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
29 changes: 25 additions & 4 deletions utilities/virt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
TIMEOUT_12MIN,
TIMEOUT_25MIN,
TIMEOUT_30MIN,
TIMEOUT_30SEC,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
SiboWang1997 marked this conversation as resolved.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
SiboWang1997 marked this conversation as resolved.
VIRT_HANDLER,
VIRT_LAUNCHER,
VIRTCTL,
Expand Down Expand Up @@ -2759,19 +2760,39 @@ def guest_reboot(vm: VirtualMachineForTests, os_type: str) -> None:
}

LOGGER.info("Stopping user agent")
run_os_command(vm=vm, command=commands["stop-user-agent"][os_type])
run_os_command(
vm=vm,
command=commands["stop-user-agent"][os_type],
ssh_timeout=TIMEOUT_30SEC if os_type == OS_FLAVOR_WINDOWS else TIMEOUT_5SEC,
)
wait_for_user_agent_down(vm=vm, timeout=TIMEOUT_2MIN)

LOGGER.info(f"Rebooting {vm.name} from guest")
run_os_command(vm=vm, command=commands["reboot"][os_type])
run_os_command(
vm=vm,
command=commands["reboot"][os_type],
ssh_timeout=TIMEOUT_30SEC if os_type == OS_FLAVOR_WINDOWS else TIMEOUT_5SEC,
)


def run_os_command(vm: VirtualMachineForTests, command: str, ssh_timeout: int = TIMEOUT_5SEC) -> Optional[str]:
"""Run a command over VM SSH.

def run_os_command(vm: VirtualMachineForTests, command: str) -> Optional[str]:
Args:
vm (VirtualMachineForTests): Target VM.
command (str): Command to execute remotely.
ssh_timeout (int): SSH command timeout in seconds.

Returns:
str: Command output.
None: When command contains "reboot" and ProxyCommandFailure occurs
(expected behavior as SSH disconnects during reboot).
"""
try:
return run_ssh_commands(
host=vm.ssh_exec,
commands=shlex.split(command),
timeout=5,
timeout=ssh_timeout,
tcp_timeout=TCP_TIMEOUT_30SEC,
)[0]
except ProxyCommandFailure:
Expand Down
Loading