From cdbb059cb2c4298d7039aa1b7ce9fc48a135fd9b Mon Sep 17 00:00:00 2001 From: LiuHailong Date: Fri, 21 Feb 2025 14:05:44 +0800 Subject: [PATCH 1/3] sysom_vmcore: Replace popen with subprocess.run Signed-off-by: LiuHailong --- script/server/sysom_vmcore/parse_panic.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/server/sysom_vmcore/parse_panic.py b/script/server/sysom_vmcore/parse_panic.py index 14ce4b68..1faac3e2 100644 --- a/script/server/sysom_vmcore/parse_panic.py +++ b/script/server/sysom_vmcore/parse_panic.py @@ -459,10 +459,12 @@ def check_panic(column): print(f"add {column['name']} calltrace line to db") return True def do_cmd(cmd): - output = os.popen(cmd) - ret = output.read().strip() - output.close() - return ret + try: + result = subprocess.run(cmd, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + return result.stdout + except subprocess.CalledProcessError as e: + print(f"Command failed with error:{e}") + return None def init_column(column): column['upload_time'] = int(time.time()) -- Gitee From 8dc174586f51eb0fb15930333ecd8bc27a42dcf5 Mon Sep 17 00:00:00 2001 From: LiuHailong Date: Fri, 21 Feb 2025 14:12:36 +0800 Subject: [PATCH 2/3] parse_panic: Replace os.system with subprocess.run Signed-off-by: LiuHailong --- script/server/sysom_vmcore/parse_panic.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/script/server/sysom_vmcore/parse_panic.py b/script/server/sysom_vmcore/parse_panic.py index 1faac3e2..ae523fcb 100644 --- a/script/server/sysom_vmcore/parse_panic.py +++ b/script/server/sysom_vmcore/parse_panic.py @@ -521,9 +521,10 @@ def mount_nfs(): return False cmd = 'mount -t nfs %s:%s %s' % (server_host,mount_point,nfs_root) - ret = os.system(cmd) - if ret != 0: - print('failed to mount to nfs %s' % nfs_root) + try: + ret = subprocess.run(cmd, check=True) + except subprocess.CalledProcessError as e: + print(f'failed to mount to nfs {nfs_root}: {e}') return False return True -- Gitee From 6e7997686b1806a2951bbe6b00a7473f5fa15168 Mon Sep 17 00:00:00 2001 From: LiuHailong Date: Fri, 21 Feb 2025 14:17:34 +0800 Subject: [PATCH 3/3] parse_panic: Replace os.system with subprocess.run in unmount_nfs() Signed-off-by: LiuHailong --- script/server/sysom_vmcore/parse_panic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/server/sysom_vmcore/parse_panic.py b/script/server/sysom_vmcore/parse_panic.py index ae523fcb..d2298b55 100644 --- a/script/server/sysom_vmcore/parse_panic.py +++ b/script/server/sysom_vmcore/parse_panic.py @@ -530,10 +530,10 @@ def mount_nfs(): def unmount_nfs(): global nfs_root - cmd = 'umount %s' % nfs_root - ret = os.system(cmd) - if ret != 0: - print(f'failed to unmount nfs at {nfs_root}') + try: + result = subprocess.run(['umount', nfs_root], check=True, stdout=subprocess.PIPTE, stderr=subprocess.PIPE) + except subprocess.CalledProcessError as e: + print(f'failed to unmount nfs at {nfs_root}:{e.stderr.decode().strip()}') def main(): global nfs_root -- Gitee