om去除root依赖

2023-11-21 18:07:10 +08:00
parent 66b09833af
commit 8e3fd58dfc
19 changed files with 390 additions and 205 deletions
--- a/script/gspylib/common/OMCommand.py
+++ b/script/gspylib/common/OMCommand.py
@ -234,14 +234,15 @@ class OMCommand():
                retry += 1
                time.sleep(1)

-            hostnameCmd = "pssh -s -H %s 'cat /etc/hostname'" % (nodename)
-            (status, output) = subprocess.getstatusoutput(hostnameCmd)
-            if status == 0 and output.strip() == nodename:
-                pass
-            else:
-                raise Exception(ErrorCode.GAUSS_512["GAUSS_51248"] % nodename
-                                + " Command: \"%s\". Error: \n%s"
-                                % (hostnameCmd, output))
+            if os.getuid() == 0:
+                hostnameCmd = "pssh -s -H %s 'cat /etc/hostname'" % (nodename)
+                (status, output) = subprocess.getstatusoutput(hostnameCmd)
+                if status == 0 and output.strip() == nodename:
+                    pass
+                else:
+                    raise Exception(ErrorCode.GAUSS_512["GAUSS_51248"] % nodename
+                                    + " Command: \"%s\". Error: \n%s"
+                                    % (hostnameCmd, output))

        except Exception as e:
            raise Exception(str(e))