fix: windows机器检查sshd服务时抛出异常 (closed TencentBlueKing#2454)

ping15 · Oct 17, 2024 · c416c26 · c416c26
1 parent 8ebfc53
commit c416c26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/backend/components/collections/agent_new/install.py b/apps/backend/components/collections/agent_new/install.py
@@ -692,7 +692,7 @@ async def execute_shell_solution_async(
 
         async with conns.AsyncsshConn(**install_sub_inst_obj.conns_init_params) as conn:
             if install_sub_inst_obj.host.os_type == constants.OsType.WINDOWS:
-                sshd_info = await conn.run(POWERSHELL_SERVICE_CHECK_SSHD, check=True, timeout=SSH_RUN_TIMEOUT)
+                sshd_info = await conn.run(POWERSHELL_SERVICE_CHECK_SSHD, check=False, timeout=SSH_RUN_TIMEOUT)
                 if sshd_info.exit_status == 0 and "cygwin" not in sshd_info.stdout.lower():
                     self.build_shell_to_batch_command_converter(execution_solution.steps, command_converter)
 

diff --git a/script_tools/setup_pagent.py b/script_tools/setup_pagent.py
@@ -374,7 +374,7 @@ def execute_shell_solution(
     ) as conn:
         command_converter = {}
         if os_type == "windows":
-            run_output: RunOutput = conn.run(POWERSHELL_SERVICE_CHECK_SSHD, check=True, timeout=30)
+            run_output: RunOutput = conn.run(POWERSHELL_SERVICE_CHECK_SSHD, check=False, timeout=30)
             if run_output.exit_status == 0 and "cygwin" not in run_output.stdout.lower():
                 for step in execution_solution["steps"]:
                     if step["type"] != "commands":