From 77680df502768894c486e004c20486a561532acb Mon Sep 17 00:00:00 2001 From: chenshiyan Date: Tue, 17 May 2022 16:24:23 +0800 Subject: [PATCH 1/2] ossre_client: add python3 support Signed-off-by: chenshiyan --- source/tools/combine/ossre_client/ossre_set/ossre.py | 2 +- source/tools/combine/ossre_client/ossre_set/tools/hwcheck.py | 4 ++-- .../combine/ossre_client/ossre_set/tools/memleak_diag.py | 4 ++-- source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py | 4 ++-- source/tools/combine/ossre_client/ossre_set/utils.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/tools/combine/ossre_client/ossre_set/ossre.py b/source/tools/combine/ossre_client/ossre_set/ossre.py index a50149de..acdd0096 100644 --- a/source/tools/combine/ossre_client/ossre_set/ossre.py +++ b/source/tools/combine/ossre_client/ossre_set/ossre.py @@ -71,7 +71,7 @@ ossre_config= { class Logger(object): def __init__(self, filename="/var/log/sysak/ossre.log"): if not os.path.exists("/var/log/sysak"): - os.mkdir("/var/log/sysak",0755); + os.mkdir("/var/log/sysak",755); self.log = open(filename, "w+") def write(self, message): diff --git a/source/tools/combine/ossre_client/ossre_set/tools/hwcheck.py b/source/tools/combine/ossre_client/ossre_set/tools/hwcheck.py index fe59b3a3..09def16a 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/hwcheck.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/hwcheck.py @@ -258,9 +258,9 @@ def main(): cmd = 'echo "" > /tmp/hwcheck.log' output = os.popen(cmd) output.close() - print "/tmp/hwcheck.log exist" + print ("/tmp/hwcheck.log exist") else: - print "/tmp/hwcheck.log not exist" + print ("/tmp/hwcheck.log not exist") ret = query(sn, data) if ret['return']: diff --git a/source/tools/combine/ossre_client/ossre_set/tools/memleak_diag.py b/source/tools/combine/ossre_client/ossre_set/tools/memleak_diag.py index 33c3fa11..66f31c1d 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/memleak_diag.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/memleak_diag.py @@ -88,9 +88,9 @@ def main(): cmd = 'echo "" > /tmp/memleakcheck.log' output = os.popen(cmd) output.close() - print "/tmp/memleakcheck.log exist" + print ("/tmp/memleakcheck.log exist") else: - print "/tmp/memleakcheck.log not exist" + print ("/tmp/memleakcheck.log not exist") ret = query(sn, data) if ret['return']: diff --git a/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py b/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py index 3c0b3aab..88e67fa4 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py @@ -467,8 +467,8 @@ if __name__ == "__main__": output = os.popen(cmd) #a = output.read() output.close() - print "/tmp/oomcheck.log exist" + print ("/tmp/oomcheck.log exist") else: - print "/tmp/oomcheck.log not exist" + print ("/tmp/oomcheck.log not exist") oom_scan(sn, data, 3) main() diff --git a/source/tools/combine/ossre_client/ossre_set/utils.py b/source/tools/combine/ossre_client/ossre_set/utils.py index 39982b42..67901743 100644 --- a/source/tools/combine/ossre_client/ossre_set/utils.py +++ b/source/tools/combine/ossre_client/ossre_set/utils.py @@ -144,7 +144,7 @@ def get_tsar_path(data=None): class Logger(object): def __init__(self, filename="/var/log/sysak/ossre.log"): if not os.path.exists("/var/log/sysak"): - os.mkdir("/var/log/sysak",0755); + os.mkdir("/var/log/sysak",755); self.log = open(filename, "w+") def write(self, message): -- Gitee From 891093ec17b4447f994702a0e7937d3342a9512d Mon Sep 17 00:00:00 2001 From: chenshiyan Date: Thu, 13 Apr 2023 15:59:50 +0800 Subject: [PATCH 2/2] ossre: fix conflict await variable name Signed-off-by: chenshiyan --- source/tools/combine/ossre_client/ossre_set/ossre.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/tools/combine/ossre_client/ossre_set/ossre.py b/source/tools/combine/ossre_client/ossre_set/ossre.py index 1f4c835a..36ad4c13 100644 --- a/source/tools/combine/ossre_client/ossre_set/ossre.py +++ b/source/tools/combine/ossre_client/ossre_set/ossre.py @@ -721,12 +721,12 @@ def check_io_indicator(ret): else: try: line = line.split() - await = float(line[await_index]) + await_t = float(line[await_index]) qusize = float(line[qusize_index]) - if (await > ossre_config['high_await_thresh'] or qusize > 10): + if (await_t > ossre_config['high_await_thresh'] or qusize > 10): highawait_num += 1 if highawait_num<10: - io_sum += "时间:%s,await:%sms,qusize:%d\n"%(line[0],await,qusize) + io_sum += "时间:%s,await:%sms,qusize:%d\n"%(line[0],await_t,qusize) except: traceback.print_exc() pass -- Gitee