[k8s] avoid bad error messages (#12871)

2026-06-27 22:53:20 +08:00 · 2020-12-15 15:00:02 -08:00
parent f4b5a8b2f7
commit a7caa14d3d
1 changed files with 9 additions and 1 deletions
@@ -256,8 +256,16 @@ class NodeUpdater:

                        retry_str = "(" + str(e) + ")"
                        if hasattr(e, "cmd"):
+                            if isinstance(e.cmd, str):
+                                cmd_ = e.cmd
+                            elif isinstance(e.cmd, list):
+                                cmd_ = " ".join(e.cmd)
+                            else:
+                                logger.debug(f"e.cmd type ({type(e.cmd)}) not "
+                                             "list or str.")
+                                cmd_ = str(e.cmd)
                            retry_str = "(Exit Status {}): {}".format(
-                                e.returncode, " ".join(e.cmd))
+                                e.returncode, cmd_)

                        cli_logger.print(
                            "SSH still not available {}, "